tire configuration
add Omniauth gem for google oauth2
add google auth to view, controller, config and routes
generate model and migration files for auth_provider and authorization
add respective associations to user and auth_provider models
resolve merge conflicts
resolve merge conflicts
modify blog and authorization factories to remove 'rand' and create some authorization unit tests
make some minor changes to factories and create authorization unit tests for user
create migration to add not null condition to uid and auth_provider in authorization table
added search box, methods on search controller and elastic search capabilities on users, countries, and blogs @stephenitis
modified search results so that results are ordered by search score, check out :load => true
search view page shows users within a country
Merge branch 'master' into development
User can now login with either Google or standard login
Rename SessionsController to SessionController
resolve merge conflict
Temp fix username nil when user logs in with Google bug. Fix redirect on Google login. Made Google button smaller.
generate profile model and migration
removed uneeded comments from controller