Merge branch 'master' into develop

doc/html/_sources/sidechain/subrotamer_optimizer.rst.txt

doc/html/_sources/user_contributions.rst.txt

doc/html/_sources/users.rst.txt

doc/html/_static/ajax-loader.gif

doc/html/_static/basic.css

doc/html/_static/comment-bright.png

doc/html/_static/comment-close.png

doc/html/_static/comment.png

doc/html/_static/doctools.js

doc/html/_static/documentation_options.js

doc/html/_static/down-pressed.png

doc/html/_static/down.png

doc/html/_static/file.png

doc/html/_static/jquery-3.2.1.js

doc/html/_static/jquery.js

doc/html/_static/language_data.js

doc/html/_static/minus.png

doc/html/_static/plus.png

doc/html/_static/searchtools.js

doc/html/_static/up-pressed.png