Added Google Plus Login
Merged master into dev