fixed feed bug @current_user
Merge branch 'master' into meltwitter