Merge branch 'master' into new_gfx2

.gitignore

CMakeLists.txt

modules/base/pymod/export_logger.cc

modules/base/src/log.hh

modules/conop/data/charmm.cif

modules/conop/pymod/export_compound.cc

modules/conop/src/compound_lib.cc

modules/conop/src/compound_lib.hh

modules/io/pymod/__init__.py

modules/io/pymod/wrap_io.cc

modules/io/src/img/map_io_mrc_handler.cc

modules/io/src/img/map_io_nanoscope_handler.cc

modules/io/src/img/map_io_tiff_handler.cc

modules/io/src/mol/dcd_io.cc

modules/io/src/mol/dcd_io.hh

modules/mol/alg/molalg.rst

modules/mol/alg/pymod/wrap_mol_alg.cc

modules/mol/alg/src/CMakeLists.txt

modules/mol/alg/src/superpose_frames.cc

modules/mol/alg/src/superpose_frames.hh