#1329 fix admin nav conflict
Merge branch 'master' into bixly-testing