Finished Ouath2 with Google+ and added tests
Added missed oauth files
Updated git ignore
Resolved Conflicts

Conflicts:
	app/models/user.rb