Commented out test that fails in Phantom
Couple of tiny fixes
Don't strip spaces from model name when generating menu text
Merge branch 'dev' into hierarchy
Don't strip spaces from model name when generating menu text - fix regression
Merge branch 'dev' into hierarchy
Support sort order in listings
Merge branch 'dev' into hierarchy
Simplify and tidy up (first round, anyway)