Merge branch 'master' of https://github.com/Ammon93/JMuehle

Conflicts:
	Muehle_Master/.project
Test