Moved edit button from the submenu to the main menu.
Merge remote-tracking branch 'origin/master'