Merge branch 'develop'

docs/Makefile

docs/__init__.py

docs/_build/doctrees/environment.pickle

docs/_build/doctrees/index.doctree

docs/_build/doctrees/source.doctree

docs/_build/html/.buildinfo

docs/_build/html/_sources/index.txt

docs/_build/html/_sources/source.txt

docs/_build/html/_static/ajax-loader.gif

docs/_build/html/_static/basic.css

...html/_static/bootstrap-2.3.2/css/bootstrap-responsive.css

.../_static/bootstrap-2.3.2/css/bootstrap-responsive.min.css

docs/_build/html/_static/bootstrap-2.3.2/css/bootstrap.css

..._build/html/_static/bootstrap-2.3.2/css/bootstrap.min.css

...static/bootstrap-2.3.2/img/glyphicons-halflings-white.png

...html/_static/bootstrap-2.3.2/img/glyphicons-halflings.png

docs/_build/html/_static/bootstrap-2.3.2/js/bootstrap.js

docs/_build/html/_static/bootstrap-2.3.2/js/bootstrap.min.js

...uild/html/_static/bootstrap-3.3.6/css/bootstrap-theme.css

.../html/_static/bootstrap-3.3.6/css/bootstrap-theme.css.map