WIP : More Inplace edit
Merge remote-tracking branch 'kalkov/develop' into develop

Conflicts:
	core/config/locales/en.yml