Merge branch 'develop' into ligand_scoring

CHANGELOG.txt

modules/conop/tests/test_heuristic_builder.cc

modules/io/doc/mmcif.rst

modules/mol/alg/pymod/chain_mapping.py

modules/mol/alg/pymod/qsscore.py

modules/mol/alg/pymod/scoring.py

modules/mol/base/doc/editors.rst

modules/mol/base/doc/entity.rst

modules/mol/base/pymod/export_residue.cc

modules/mol/base/pymod/export_residue_view.cc