uid should be string to avoid error on postgresql
Added LinkedIn as an External Authentication Provider
Update lib/sorcery/controller.rb

Restoring the old session values after reset_session!
Update lib/sorcery/controller.rb

reverse_merge not working with symbols...fixing that
Skipped the get_access_token call for facebook when the access token is already in the params.
Updated the facebook login_from to allow logins using the Facebook JavaScript SDK.
Changed the inheritance verification to just check wheter the mailer class inherits from the base ActionMailer class, not check if it's the direct ancestor.
Merge branch 'better_inheritance_verification'
Merge pull request #332 from yagitoshiro/fix_add_provider_to_user

uid should be string to avoid error on postgresql
Merge pull request #344 from azfire/external-linkedin

Added LinkedIn as an External Authentication Provider
Merge pull request #347 from kenips/master

Support customizable Facebook permissions
Merge pull request #348 from satb/master

Fix for https://github.com/NoamB/sorcery/issues/250 (restoring previous session state after reset_session!)
Merge pull request #351 from coachoasis/better_inheritance_verification

Fixed an issue with mailers not inheriting directly from ActionMailer::Base
Allow loading the engine in Rails 4
Merge pull request #356 from rewritten/patch-1

Allow loading the engine in Rails 4
same rescue to ActiveRecord::RecordNotFound to 258627202c2cedfebfa3c4c72f42defe7485e74d
Merge pull request #359 from kuboon/activerecord-patch

same rescue to ActiveRecord::RecordNotFound to 2586272
rename local variable "provider" to "provider_name"
replace "@provider" to "provider"
replace "@user_hash" to "user_hash"