Merge branch 'develop'
The urls under /_ah/* are handled by GAE security
Merge branch 'master' into develop