add category scaffold, picture and add en & fa feilds,
fix conflict on gemfile, route and schema