before merge
Merge branch 'master' of https://github.com/Factor-X/awac

Conflicts:
	conf/routes
Cleaned data_importer_resources/translations/ folder
before merge
Merge branch 'master' of https://github.com/Factor-X/awac

Conflicts:
	data_importer_resources/translations/.~lock.translations_common.xls#
Translations management
Merge branch 'master' of https://github.com/Factor-X/awac