fix todays_controller#roulette
admin/users_controller tests green
Merge remote-tracking branch 'origin/master'