BZ-12750: assure that a user's location is cached properly
BZ-12960 Fixing css conflict
BZ-13110: Disable 'Save' buttons on ECM wizard while adding or editing an Incetive
Merge branch 'RC20140807' of https://github.com/NoesisEnergy/bootstrap into RC20140807
BZ-13110: Disable 'Save' buttons on ECM modal wizard while adding or editing an Incentive
Merge remote-tracking branch 'origin/RC20140731' into RC20140807

* origin/RC20140731:
  BZ-12750: assure that a user's location is cached properly
BZ-13133:As a projects user I would like the ability to change the term length on the competitive estimates
Merge branch 'Competitive_Estimates-Create' into RC20140807

Conflicts:
	.idea/workspace.xml
	src/main/js/bootstrap.deps.js
	src/main/js/noesis/bootstrap/Entry.js
	src/main/js/noesis/bootstrap/projects/controllers/projectFinancingController.js
	src/main/js/noesis/bootstrap/projects/directives/details/tabs/neFinancing.html
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

Conflicts:
	.idea/workspace.xml
	src/main/js/noesis/bootstrap/Entry.js
	src/main/js/noesis/bootstrap/projects/controllers/projectFinancingController.js
	src/main/js/noesis/bootstrap/projects/directives/details/tabs/neFinancing.html
Merge branch 'integration' of https://github.com/NoesisEnergy/bootstrap into integration