Merge branch 'master' into save-translated

Conflicts:
	app/components/phrases/PhraseService.js
	app/components/transUnit/TransUnitService.js
	app/components/transUnit/translation/TranslationCtrl.js
	app/editor/EditorContentCtrl.js