Modifying header
Added comments (we use idString in Msg right now!)
Cleaning up anjuta ... once again.
Minor changes, cleaning up
Merge branch 'master' into savingdata

Conflicts:
	src/controller/Controller.cpp
	src/controller/Controller.hpp
Cleaning up... to be continued
Ready to merge, uncompiled