CELDL-473
Merge branch 'master' of https://github.com/Factor-X/awac

Conflicts:
	app/eu/factorx/awac/angular/controllers/AdminTranslationBaseListCtrl.coffee
CELDL-473