bug
Revert "bug"

This reverts commit 49959d3b6bb3b92d119e301ebbdc358e33a41e7e.
no message
Merge branch 'master' of https://github.com/guinaudin/ZappWebApp

Conflicts:
	src/main/java/fr/ece/historic/ApplicationStartup.java
	src/main/java/fr/ece/historic/SimpleQuartzJob.java