upped to version 2
Merge branch 'master' of https://github.com/pdemirdjian/jerry-working

Conflicts:
	app.yaml