Fixed merge error
getSession() is removed in fb sdk > 3
remove comment block
Updated config calls to be compatible with Kohana 3.2
Merge remote-tracking branch 'edwinschaap/master' into 3.1/master
Adding support for Kohana 3.2 and ORM.
 Deleting user_identity via ORM instead of DB directly.
 Adding request->param support for the following user controller actions:
   action_provider
   action_provider_return
   action_associate
   action_associate_return
 Adding new route that works with the above actions.
 Adding a proper duplicate email message.
 Renaming the user_identity table to user_identities.
Removing DOS line endings.
 This will help find those problems:
 find . -type f -exec file "{}" ";"|grep CRLF
Switching back to DB style user_identity deleting.
Updating to the new Facebook API.
Fixing Facebook API for email scope instead of req_perms.
When trying to login/register with another provider and failing,
redirect instead of trying to create another account.
Adding support for Kohana 3.2 for admin_user controller actions.
Removing duplicate message.
removed leftover git merge message opting for the develop branch version line comment.
v3.2
Merge remote-tracking branch 'aonde/master' into 3.2/master
fixed relative urls of background images for login providers
fixed typo and more image url fixes
fixed another typo and some image urls
fixed a redirect issue after login
The session var 'returnUrl' was not correctly set if the Kohana::$site_url was non-empty.
fixed schema.sql - non-pluralized table name