route refactoring
Merge branch 'master' of https://github.com/Factor-X/awac
bad test
ICo naming correction
Merge branch 'master' of https://github.com/Factor-X/awac

t push:x# the commit.
Merge branch 'master' of https://github.com/Factor-X/awac

Conflicts:
	conf/META-INF/persistence.xml
	data_importer_resources/awac_data_09-08-2014/.~lock.AWAC-tous-calcul_FE.xls#
Merge branch 'master' into wip/reporting_reeng

Conflicts:
	conf/META-INF/persistence.xml
	data_importer_resources/awac_data_09-08-2014/.~lock.AWAC-tous-calcul_FE.xls#
	public/javascripts/app.js