BZ-13133:As a projects user I would like the ability to change the term length on the competitive estimates
Merge branch 'RC20140807' of https://github.com/NoesisEnergy/bootstrap into RC20140807

Conflicts:
	src/main/js/noesis/bootstrap/projects/directives/details/tabs/neSummaryPage.html
BZ-13204:Change "Client" to "Prepared For" on project details
BZ-13133:As a projects user I would like the ability to change the term length on the competitive estimates
Merge branch 'RC20140807' into integration