categories in controls
categories in controls
Merge remote-tracking branch 'origin/feature/adding-fields-from-rails-app' into feature/adding-fields-from-rails-app
reordering categories list in controls
objects icon fix
Merge pull request #169 from reciprocity/feature/adding-fields-from-rails-app

Feature/adding fields from rails app