Merge branch 'master' into filter

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