rails g model category
Merge branch 't12' into develop