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

Conflicts:
	Muehle_Master/src/de/dhbw/muehle/gui/View.java