disable google login
fix translations and setup 500 error page
revert google login`
Merge branch 'master' of github.com:fay/lianpeng
Merge branch 'master' of github.com:fay/lianpeng
Merge branch 'master' of github.com:fay/lianpeng
Merge branch 'master' of github.com:fay/lianpeng
Merge branch 'master' of github.com:fay/lianpeng
Merge branch 'master' of github.com:fay/lianpeng

Conflicts:
	lianpeng/locale/zh_CN/LC_MESSAGES/django.mo
Merge branch 'master' of github.com:fay/lianpeng