allow google+ authentication
merge with master