maven + springmvc + googleAPpEngine
Merge https://github.com/lili1725/patrzek_rimassa_webapp

Conflicts:
	README.md