final cleaning
Merge branch 'master' of ssh://git@github.com/jocklas/devguiGroup8.git

Conflicts:
	src/view/CustomTheme.java