stuff
edit profile finished, except pictures get lost
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team4