Conflicts:
	modules/gui/src/data_viewer/data_viewer.cc
	modules/gui/src/data_viewer/data_viewer.hh
	modules/gui/src/file_loader.cc
	modules/gui/src/gosty_app.hh
	modules/gui/src/scene_selection.cc