Merge branch 'master' into transunit-controller

Conflicts:
	app/components/phrases/PhraseService.js
	app/components/transUnit/transUnitDirective.js
	app/editor/EditorCtrl.js