Merge branch 'master' into develop

doc/html/objects.inv

doc/html/portableIO.html

doc/html/py-modindex.html

doc/html/references.html

doc/html/scoring/all_atom_scorers.html

doc/html/scoring/backbone_score_env.html

doc/html/scoring/backbone_scorers.html

doc/html/scoring/index.html

doc/html/scoring/other_scoring_functions.html

doc/html/search.html

doc/html/searchindex.js

doc/html/sidechain/disulfid.html

doc/html/sidechain/frame.html

doc/html/sidechain/graph.html

doc/html/sidechain/index.html

doc/html/sidechain/loading.html

doc/html/sidechain/rotamer.html

doc/html/sidechain/rotamer_constructor.html

doc/html/sidechain/rotamer_lib.html

doc/html/sidechain/subrotamer_optimizer.html