fixed edit again
Merge remote-tracking branch 'origin/3942642' into 3942642

Conflicts:
	js/main.js