Merge branch 'develop'
# Conflicts:
# .gitignore
# Dockerfile
# README.md
# css/all.min.css
# docs/.doctrees/developer-guide.doctree
# docs/.doctrees/developers.doctree
# docs/.doctrees/environment.pickle
# docs/.doctrees/faq.doctree
# docs/.doctrees/index.doctree
# docs/.doctrees/installation.doctree
# docs/.doctrees/rest-api.doctree
# docs/.doctrees/table-with-code.doctree
# docs/.doctrees/user-guide.doctree
# docs/_sources/developer-guide.txt
# docs/_sources/faq.txt
# docs/_sources/index.txt
# docs/_sources/installation.txt
# docs/_sources/rest-api.txt
# docs/_sources/user-guide.txt
# docs/developer-guide.html
# docs/faq.html
# docs/index.html
# docs/installation.html
# docs/objects.inv
# docs/rest-api.html
# docs/searchindex.js
# docs/source/developer-guide.rst
# docs/source/faq.rst
# docs/source/index.rst
# docs/source/installation.rst
# docs/source/rest-api.rst
# docs/source/user-guide.rst
# docs/user-guide.html
# gruntfile.js
# js/all.min.js
# js/collection/node/NodeListModel.js
# js/model/index/IndexRoutingTableModel.js
# js/model/index/IndexShardModel.js
# js/model/node/NodeInfoModel.js
# js/model/node/NodeModelFactory.js
# js/model/node/NodeStatsModel.js
# js/model/rest/RESTModelFactory.js
# js/route/IndexRoute.js
# js/template/IndexTemplate.js
# js/template/NodeTemplates.js
# js/util/tablesorter.js
# js/util/versionutil.js
# js/view/index/IndexView.js
# js/view/index/action/CreateIndexView.js
# js/view/node/DiagnosticsRules.js
# js/view/node/NodeStatsListView.js
# js/view/node/NodeStatsView.js
# js/view/node/NodeViewFactory.js
# package.json
# tpl/index.html