formatting issues
updated icon style
Merge branch 'estimate-word-templates' into integration

Conflicts:
	src/main/js/noesis/bootstrap/savingsEstimator/controllers/estimatesController.js