BZ-12940 updated Saving proposal, fixed Cost Chart1
Merge remote-tracking branch 'origin/estimate-word-templates' into integration

Conflicts:
	src/main/js/noesis/bootstrap/savingsEstimator/directives/pieChartEstimate.js