Conflicts:
	deployment/linux/create_bundle.py
	modules/conop/doc/conop.rst
	modules/conop/src/heuristic_connect.cc
	modules/doc/install.rst
	modules/gfx/src/impl/cartoon_renderer.cc
	modules/gui/src/entity_explorer/entity_explorer.cc
	modules/gui/src/entity_explorer/entity_explorer_model.cc
	modules/gui/src/entity_explorer/entity_explorer_model.hh
	modules/gui/src/entity_explorer/menu_item.hh
	modules/gui/src/python_shell/python_shell_widget.cc
	modules/io/src/mol/entity_io_mae_handler.hh
	modules/io/src/mol/sdf_writer.cc
	modules/mol/alg/pymod/export_superpose_frames.cc
	modules/mol/base/doc/editors.rst
	modules/mol/base/pymod/export_bond.cc
	modules/mol/base/src/impl/query_impl.cc
	modules/mol/base/tests/test_residue.cc
	modules/qa/pymod/CMakeLists.txt
	modules/qa/pymod/__init__.py
	modules/qa/pymod/export_interaction.cc
	modules/qa/pymod/export_packing.cc
	modules/qa/pymod/export_reduced.cc
	modules/qa/pymod/export_torsion.cc
	modules/qa/pymod/pdbtools.py
	modules/qa/src/all_atom_potential.cc
	modules/qa/src/all_atom_potential.hh
	modules/qa/src/atom_types.cc
	modules/qa/src/atom_types.hh
	modules/qa/src/histogram.hh
	modules/qa/src/impl/reduced_impl.hh
	modules/qa/src/index.hh
	modules/qa/src/interaction_statistics.cc
	modules/qa/src/interaction_statistics.hh
	modules/qa/src/module_config.hh
	modules/qa/src/multi_classifier.hh
	modules/qa/src/packing_potential.cc
	modules/qa/src/packing_potential.hh
	modules/qa/src/packing_statistics.cc
	modules/qa/src/packing_statistics.hh
	modules/qa/src/rapdf.cc
	modules/qa/src/rapdf.hh
	modules/qa/src/reduced_potential.cc
	modules/qa/src/reduced_potential.hh
	modules/qa/src/reduced_statistics.cc
	modules/qa/src/reduced_statistics.hh
	modules/qa/src/solis_torsion_potential.cc
	modules/qa/src/solis_torsion_potential.hh
	modules/qa/src/solis_torsion_statistics.cc
	modules/qa/src/solis_torsion_statistics.hh
	modules/qa/src/torsion_potential.cc
	modules/qa/src/torsion_potential.hh
	modules/qa/src/torsion_statistics.cc
	modules/qa/src/torsion_statistics.hh
	modules/seq/base/pymod/export_sequence.cc
	modules/seq/base/src/sequence_handle.cc
	modules/seq/base/src/sequence_handle.hh
	scripts/dng_cl.in
	scripts/gipltng.bat.in
	scripts/gipltng.in