Add category and order field to feature types, and sort icons on edit screen and edit page
Merge branch 'develop' of github.com:ngageoint/geoq into develop