checkstyle, javadoc
Merge branch 'master' of https://github.com/Gruppe14/KIT-PSE

Conflicts:
	app/controllers/Website.java
	app/what/web/ChartHistory.java