Minor improvements.
Worked on Profile page. But is not fully functional yet.
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team7

Conflicts:
	Skeleton/src/main/java/org/sample/controller/ProfileController.java