Wording and buttons
Merge remote-tracking branch 'origin/master'

Conflicts:
	Main/web/edit.jsp
Wording and buttons