Reengineering Indicator-Reporting
Symlink for persistence.xml
Model re-made
CELDL-136 Implementing services
CELDL-136 Implementing services
Added restrictedScope field in Report entity
BaseIndicator/Indicator/Report Importers
before merge
Merge branch 'wip/reporting_reeng' of https://github.com/Factor-X/awac into wip/reporting_reeng

Conflicts:
	app/eu/factorx/awac/models/knowledge/Report.java
	app/eu/factorx/awac/service/impl/ReportResultServiceImpl.java
Implementing controller layer
ResultController all in one piece
before merge
before merge
merged master
CELDL-136-Report-Reengineering
Merge branch 'wip/reporting_reeng' of https://github.com/Factor-X/awac into wip/reporting_reeng
CELDL-136-Report-Reengineering
Merge remote-tracking branch 'origin/master' into wip/reporting_reeng

Conflicts:
	app/eu/factorx/awac/controllers/AdminController.java
	conf/routes
	data_importer_resources/awac_data_09-08-2014/.~lock.AWAC-tous-calcul_FE.xls#
	public/javascripts/app.js
merged master
merged master