Added order_by to category resource
Merge branch 'master' of github.com:MediaSapiens/flamaster