refs #2733 - ordered all content types
Merge pull request #132 from eugenst/2733_order_of_fields

refs #2733 - ordered all content types