Merge branch 'master' of https://github.com/samuelhug/closure_boilerplate

Conflicts:
	tools/appengine.py
Merge branch 'master' of https://github.com/samuelhug/closure_boilerplate

Conflicts:
	tools/appengine.py