Bump for emergency deployment.
Merge branch 'master' into rally

Conflicts:
	war/WEB-INF/appengine-web.xml