Merge branch 'changeshowAd' of https://github.com/ese-unibe-ch/ese2014-team5

Conflicts:
	Skeleton/src/main/java/org/sample/controller/service/SampleService.java
	Skeleton/src/main/java/org/sample/controller/service/SampleServiceImpl.java