Mode system
Merge branch 'master' of https://github.com/mrbichel/cruxTracker

Conflicts:
	src/testApp.cpp