https successfully working for expertiza
Google login changes made and changes tested
Merge branch 'ssl_auth2' of github.com:Kavit900/expertiza into merge_branch
Added google plus login image and few comments
Merge branch 'google_omniAuth' of github.com:Kavit900/expertiza into merge_branch
Added google login image
Merge branch 'google_omniAuth' of github.com:Kavit900/expertiza into merge_branch
Adding gemfile.lock to fix travis cl build errors
made all changes other than test cases
Merge branch 'merge_branch' of github.com:Kavit900/expertiza into merge_branch
added google_config yaml file to store key and secret
Test cases for SSL and google login verification
Merge branch 'google_omniAuth' of github.com:Kavit900/expertiza into rails4
Merge branch 'ssl_auth2' of github.com:Kavit900/expertiza into rails4
Adding google.yml file
Fixing Travis CL build issues
Remove MiniTest
Merge branch 'e1474' into rails4

Conflicts:
	Gemfile.lock
Remove unused cucumber tests
Merge remote-tracking branch 'origin/rails4' into rails4