final bugged version with workmanager
Add some comments
no message
Merge branch 'master' of https://github.com/guinaudin/ZappWebApp

Conflicts:
	src/main/webapp/WEB-INF/web.xml
	src/main/webapp/index.jsp