Merge branch 'master' into develop

CHANGELOG

CMakeLists.txt

container/Dockerfile

doc/conf.py.in

doc/container/singularity.rst

doc/html/_sources/buildsystem.txt

doc/html/_sources/changelog.txt

doc/html/_sources/container/singularity.txt

doc/html/_sources/loop/backbone.txt

doc/html/_sources/loop/structure_db.txt

doc/html/_sources/modelling/algorithms.txt

doc/html/_sources/references.txt

doc/html/_sources/sidechain/frame.txt

doc/html/_sources/sidechain/index.txt

doc/html/_sources/sidechain/rotamer.txt

doc/html/_sources/sidechain/rotamer_constructor.txt

doc/html/_sources/sidechain/rotamer_id.txt

doc/html/actions/index.html

doc/html/actions/index_dev.html

doc/html/buildsystem.html