Integrate with GAE
Merge branch 'master' of https://github.com/shamak/eventPlanner_backend

Conflicts:
	.gitignore
	Makefile