Added code to display inherited properties when editing document types.

Added code to save the sort order between direct and inherited properties when saving a document type.
Updated content editor to sort all properties by sortOrder instead of grouping by inheritance level then sorting.

 for U4-2355