fixed conflict between GAE and 2-factor authentication
Merge branch 'master' of github.com:web2py/web2py