before merge
CELDL-77 - Minor improvements
Merge branch 'deploy-v1.0' of https://github.com/Factor-X/awac into deploy-v1.0

Conflicts:
	data_importer_resources/translations/translations_common.xls