Fixed some errors
do not change user!
Merge branch 'master' of https://github.com/FWidm/Sopro2013MMS.git