adding alphabetical sort to types
Merge branch 'finalfantasy' of github.com:Solid-Interactive/grasshopper-admin into finalfantasy

Conflicts:
	package.json