no message
no message
Edit Add with Http 500 error without solution
Fixed multiple bugs. See email (@10.11.14: 11:06) for further info.
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team5 into changeshowAd

Conflicts:
	Skeleton/src/main/java/org/sample/controller/IndexController.java
	Skeleton/src/main/java/org/sample/controller/service/SampleService.java
	Skeleton/src/main/java/org/sample/controller/service/SampleServiceImpl.java
	Skeleton/src/main/webapp/pages/showad.jsp
	Skeleton/src/main/webapp/web/css/style.css
Merge branch
- added change ad function