Add custom ordering to content types
Merge branch 'master' of github.com:alphagov/transition into add_ordering_to_content_types

Conflicts:
	db/schema.rb
Merge pull request #64 from alphagov/add_ordering_to_content_types

Add ordering to content types