commit
changed nav_edit
Merge branch 'master' into nav_edit