BZ-11095:As an energy analyst, I want to see the total ECM cost, total incentive amount and net ECM cost for each incentive when looking at Details of the ECMs, so that I can see and understand the breakdown of each costing component of the overall ECM.
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap

Conflicts:
	src/main/js/noesis/bootstrap/projects/ECM/controllers/incentiveListController.js