Modified app configuration and handler
Merge remote-tracking branch 'remotes/lekaha/prototype1' into prototype1

Conflicts:
	app.yaml