ajaxi ja webi
Merge branch 'master' of https://github.com/dirgni/CoffeeBreakApp.git

Conflicts:
	.gwt/.gwt-log
	war/WEB-INF/web.xml
	war/ajax.js