Added the google+ basic setup.
Merge branch 'master' into google-login
Got email from google.
Google+ login working for web.
Merge branch 'master' into google-login

Conflicts:
	facebook/facebook.js
	socket/socket-client.js
Adding google+ picture to the images list.
Closing the return window on google sign in.
Merge branch 'master' into google-login
Getting the google + login on phonegap.
Adding logs for the google+ login errors.
Fixing the navigate bug which show create room after signin.
Merge branch 'master' into google-login
Merge branch 'master' into google-login
Handling the pictures for existing users.
Merge branch 'master' into google-login

Conflicts:
	socket/socket-client.js
	ui/guest-settings.js
Merge pull request #336 from scrollback/google-login

Google+ login