Merge branch 'fabian1995-master' of https://github.com/Peda1996/CMM into Peda1996-fabian1995-master

Conflicts:
	src/at/jku/ssw/cmm/gui/GUImain.java
	src/at/jku/ssw/cmm/gui/quest/GUIProfileManager.java