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

Conflicts:
	data_importer_resources/translations/translations.xls
	public/javascripts/app.js
translations added