BZ-11274 Update project savings form to match finance estimator
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap

Conflicts:
	src/main/js/noesis/bootstrap/projects/controllers/estimatesController.js
BZ-11274 Update project savings form to match finance estimator