A lot of dicking around
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team1

Conflicts:
	Source/src/main/webapp/pages/adDescription.jsp