# disable gmail (to be replaced with G+) and Twitter oAuth for time being
Merge branch 'master' into production