Manual windowing added
Merge branch 'master' into gui
fixed testing suite given changes
Merge branch 'master' into gui

Conflicts:
	test/tests/resources/settings.yaml
cleaned up project directory structure for gui