Merge branch 'develop' into loop

Conflicts:
	cmake_support/doc/index.rst
	conf-scripts/bc2-conf
	doc/contributing.rst
	doc/html/_modules/index.html
	doc/html/_modules/promod3/core/argcheck.html
	doc/html/_modules/promod3/core/helper.html
	doc/html/_modules/promod3/rawmodel.html
	doc/html/_sources/cmake/index.txt
	doc/html/_sources/contributing.txt
	doc/html/buildsystem.html
	doc/html/changelog.html
	doc/html/cmake/index.html
	doc/html/contributing.html
	doc/html/core/argcheck.html
	doc/html/core/helper.html
	doc/html/core/index.html
	doc/html/developers.html
	doc/html/genindex.html
	doc/html/index.html
	doc/html/objects.inv
	doc/html/py-modindex.html
	doc/html/rawmodel/index.html
	doc/html/search.html
	doc/html/searchindex.js
	doc/html/users.html
	extras/pre_commit/pm3_csc/filecheck/rest.py
	loop/src/loop_candidate.hh
	meld/CMakeLists.txt
	rawmodel/CMakeLists.txt
	sidechain/CMakeLists.txt