Update devise
Allow login with email or nickname
Merge branch 'master' into stable
Allow loading of other's users feed
Merge branch 'master' into stable