Changes to user class for upgrade to laravel 4.1.26
Merge branch 'master' into deploy
Merge branch 'deploy' of https://github.com/dehrgg/feed into deploy