erer
Merge branch 'master' of github.com:JanAtuerlich/HakunaContacta

Conflicts:
	HakunaContacta/war/WEB-INF/appengine-web.xml
Merge branch 'master' of github.com:JanAtuerlich/HakunaContacta
sessions enabled