Merge branch 'ecmestimator' of https://github.com/NoesisEnergy/bootstrap into ecmestimator

Conflicts:

src/main/js/noesis/bootstrap/savingsEstimator/directives/neEstimateSavin
gsB.html