package path changed
classpath changed
controller & gui
Merge branch 'master' of https://github.com/leedam01/softproj-zhaw into leedam01

Conflicts:
	.classpath
	.project
merge
old paths removed