Token improvenments

+ Tokens now saved in profile.cp
+ Tokens now loaded in the profile edit gui
small fixes

+ small fixes
small fixes
Merge branch 'Peda1996-master' of https://github.com/Peda1996/CMM into Peda1996-Peda1996-master

Conflicts:
	src/at/jku/ssw/cmm/profile/Profile.java
Merge branch 'Peda1996-Peda1996-master'