Merge remote-tracking branch 'origin/cmake_changes2' into develop

Conflicts:
	modules/mol/alg/pymod/__init__.py

Had to manually add the changed module name (_mol_alg --> _ost_mol_alg )
in __init__.py