corrections for BAD tests
some bugs into bad generator + change the type of the question a308
correctiond for BAD tests
some bugs into bad generator + change the type of the question a308
Merge branch 'master' of https://github.com/Factor-X/awac
correctiond for BAD tests
some bugs into bad generator
Merge branch 'master' of https://github.com/Factor-X/awac
bads and bads tests
add codeconvertion into migration
before merge
Merge branch 'master' of https://github.com/Factor-X/awac
Merge branch 'wip/reporting_reeng' of https://github.com/Factor-X/awac

Conflicts:
	data_importer_resources/awac_data_09-08-2014/.~lock.AWAC-tous-calcul_FE.xls#
	migrations/migration-data-v0.7-v0.8/CELDL-65-Indicator-Calculator-JoinTable.sql
	migrations/migration-data-v0.7-v0.8/refesh_some_question_default_unit.sql
Merge branch 'master' into wip/reporting_reeng