Added comments
Added comments
Fixed file which caused error when merging
Merge branch 'master' of https://github.com/fabian1995/CMM

Conflicts:
	src/at/jku/ssw/cmm/CMMwrapper.java

Conflicts:
	src/at/jku/ssw/cmm/CMMwrapper.java
C Compact GUI now has two modes: with profiles and without profiles

GUImain.advancedGUI = false: no profiles
GUImain.advancedGUI = true: profile mode
Improved gui mode settings
Added error check to settings class
Added better settings and file management
Merge pull request #113 from fabian1995/master

Alpha 1.2 Build 2