Merge branch 'develop' of git@bc2-dng01.bc2.unibas.ch:/opt/git/GIT_DATA/ost into develop

CMakeLists.txt

cmake_support/OST.cmake

deployment/macos/deps.py

doc/conf/conf.py

examples/demos/the_hammer.py

modules/base/tests/test_generic_property.cc

modules/bindings/pymod/CMakeLists.txt

modules/bindings/pymod/clustalw.py

modules/bindings/pymod/tmtools.py

modules/bindings/tests/test_clustalw.py

modules/bindings/tests/testfiles/seq1.fasta

modules/bindings/tests/testfiles/seq1_seq2_aln.fasta

...dings/tests/testfiles/seq1_seq2_aln_options_changed.fasta

modules/bindings/tests/testfiles/seq2.fasta

modules/conop/src/CMakeLists.txt

modules/conop/src/builder.cc

modules/conop/src/conop.cc

modules/conop/src/heuristic_builder.cc

modules/conop/src/rule_based_builder.cc

modules/conop/tests/test_builder.cc