rake db:sample category select fix
Merge remote-tracking branch 'origin/develop'