Moved tests to correct folder
Merge branch 'develop' of github.com:ironjan/MensaUPB into develop

Conflicts:
	src/test/java/SanityTest.java