BZ-9998: markup for estimator
Merge branch 'master' of https://github.com/NoesisEnergy/bootstrap

Conflicts:
	src/main/js/noesis/bootstrap/projects/directives/neCreateEstimate.html