Merge branch 'feature/1.7.7' into develop
Merge https://github.com/mzimmerman/appenginetesting
Merge branch 'master' of git://github.com/icub3d/appenginetesting