Merge branch 'develop' into mmcifparser

deployment/linux/debian/debian/source/include-binaries

deployment/linux/fedora/openstructure.desktop

deployment/linux/fedora/openstructure.spec

deployment/linux/reset_repository.py

deployment/linux/reset_repository_qmean.py

modules/base/pymod/wrap_base.cc

modules/config/CMakeLists.txt

modules/config/config.hh.in

modules/config/version.hh.in

modules/conop/doc/cleanup.rst

modules/conop/doc/conop.rst

modules/conop/pymod/CMakeLists.txt

modules/conop/pymod/__init__.py

modules/conop/pymod/cleanup.py

modules/conop/tests/CMakeLists.txt

modules/conop/tests/sample_noligands.pdb

modules/conop/tests/sample_nowater.pdb

modules/conop/tests/sample_test_cleanup.pdb

modules/conop/tests/test_cleanup.py

modules/geom/pymod/export_mat2.cc