Update user factory
Fix for sports model
Add userhash to User model
Add Faye-rails
Update factory
Add user_hash
User friends images in view
Rebase to Faye::controller
Merge branch 'karma' of github.com:loed-idzinga/lifefire into karma