uncommited changes to google auth handler from live
Merge branch 'stable' of github.com:destinygg/website into stable