changed version in pom.xml and appengine-web.xml to 2.1
Merge branch 'version_2_1' of github.com:HackerspaceBremen/hshb_notifier_be into version_2_1

Conflicts:
	pom.xml