+ G+ integration
Merge branch 'master' into production