cc
Merge remote-tracking branch 'origin/0.5' into 0.5

Conflicts:
	app/views/users/edit.html.erb
Merge pull request #197 from rajthilakmca/0.5

fixed google oauth
Merge remote-tracking branch 'origin/0.5' into 0.5