To repair
Merge branch 'master' of https://github.com/balmor/translation-fields into New

Conflicts:
	js/form-widget.js