core-5306 app menu re-org
Merge branch 'dev' of github.com:iPlantCollaborativeOpenSource/DiscoveryEnvironment into dev
core-5306 finish up re-organising new menu