menu reshuffle fixes #722
Merge branch 'createsecurity' into testing
Merge branch 'testing' of https://github.com/sharewave/frontus into testing