solve verification bugs + dirvers
Merge branch 'v1.1-b'
re-compile
Merge branch 'master' of https://github.com/Factor-X/awac

Conflicts:
	app/eu/factorx/awac/models/code/type/QuestionCode.java
	data_importer_resources/codes/codes_to_import_Enterprise.generated.xls
	data_importer_resources/codes/codes_to_import_Municipality.generated.xls
	data_importer_resources/codes/codes_to_import_common.generated.xls
	data_importer_resources/translations/translations_Enterprise.generated.xls
	data_importer_resources/translations/translations_Municipality.generated.xls
merge of branch 1.1 on master