scheisse
Merge branch 'master' of https://github.com/SundSGithub/ProjectX

Conflicts:
	zentask/logs/application.log
	zentask/stanlyIQ.h2.db
Merge branch 'master' of https://github.com/SundSGithub/ProjectX
Aenderungen an der UI
Merge branch 'master' of https://github.com/SundSGithub/ProjectX.git