BZ-12940 updated Saving proposal, fixed chart labels
BZ-12994 fixing circular dependencies
Merge branch 'estimate-word-templates' of https://github.com/NoesisEnergy/bootstrap into estimate-word-templates
Merge branch 'estimate-word-templates' into integration

Conflicts:
	src/main/js/noesis/bootstrap/savingsEstimator/directives/neEstimatePreview.html