gae 1.8.8
Merge branch 'master' of github.com:jeukku/waazdoh.service

Conflicts:
	pom.xml