appengine files
Merge branch 'master' of https://github.com/lgazo/glasshopper

Conflicts:
	.gitignore
	src/main/webapp/WEB-INF/appengine-web.xml
merged list