fixed simple_form problem
Merge branch 'master' of https://github.com/enjoycompany/omrails