Committing changes up to 20140430-1642
Updates to main txt files to 20140603-0907.
Added the edit action.
Changes to 20140604-1947