BZ-13093:Prepared on date on financing tab is static
BZ-13100: Certain Savings Estimates will not download
BZ-13093:Prepared on date on financing tab is static
BZ-13123:Finance Estimate in EBP does not Update
BZ-13123:Finance Estimate in EBP does not Update
Merge remote-tracking branch 'origin/production' into release-candidate

* origin/production:
  BZ-13123:Finance Estimate in EBP does not Update
  BZ-13100: Certain Savings Estimates will not download
  BZ-13093:Prepared on date on financing tab is static
Merge branch 'release-candidate' of https://github.com/NoesisEnergy/bootstrap into release-candidate

# By vandreiev
# Via vandreiev
* 'release-candidate' of https://github.com/NoesisEnergy/bootstrap:
  BZ-13123:Finance Estimate in EBP does not Update
  BZ-13093:Prepared on date on financing tab is static
BZ-13103 fixed shifting date
BZ-13103 fixed date shift
Merge remote-tracking branch 'origin/RC20140807' into release-candidate

* origin/RC20140807: (41 commits)
  BZ-13110: Disable 'Save' buttons on ECM modal wizard while adding or editing an Incentive
  BZ-13110: Disable 'Save' buttons on ECM wizard while adding or editing an Incetive
  BZ-12960 Fixing css conflict
  BZ-13133:As a projects user I would like the ability to change the term length on the competitive estimates
  BZ-12960 Copy the current lifecycle cash flow chart to the project details tab
  BZ-12960 Copy the current lifecycle cash flow chart to the project details tab
  BZ-12750: assure that a user's location is cached properly
  BZ-13134 changed project details cash flow copy and column arrangement
  BZ-12901: Remove require validation for job role field, and add it to first and last name
  BZ-12901: Remove require validation for job role field
  BZ-12960 Copy the current lifecycle cash flow chart to the project details tab
  BZ-13016:Removing oneself from a project lands the user on the old projects list page
  BZ-13123:Finance Estimate in EBP does not Update
  BZ-13050 src/main/js/noesis/bootstrap/savingsEstimator/controllers/estimatesController.js
  BZ-13131 No visual validation for missing phone number on branding settings pop up on estimate download
  BZ-13102: Chnage the way to get the current company for the participants panel
  BZ-12960 Copy the current lifecycle cash flow chart to the project details tab
  BZ-12960 Copy the current lifecycle cash flow chart to the project details tab
  BZ-12960 Copy the current lifecycle cash flow chart to the project details tab
  BZ-12960 Copy the current lifecycle cash flow chart to the project details tab
  ...

Conflicts:
	src/main/js/noesis/bootstrap/projects/controllers/projectFinancingController.js
Merge remote-tracking branch 'origin/production' into release-candidate

* origin/production:
  BZ-13103 fixed date shift
  BZ-13103 fixed shifting date
Merge branch 'release-candidate' of https://github.com/NoesisEnergy/bootstrap into release-candidate

# By Gustavo Medina (14) and others
# Via David Valys (7) and others
* 'release-candidate' of https://github.com/NoesisEnergy/bootstrap: (41 commits)
  BZ-13110: Disable 'Save' buttons on ECM modal wizard while adding or editing an Incentive
  BZ-13110: Disable 'Save' buttons on ECM wizard while adding or editing an Incetive
  BZ-12960 Fixing css conflict
  BZ-13133:As a projects user I would like the ability to change the term length on the competitive estimates
  BZ-12960 Copy the current lifecycle cash flow chart to the project details tab
  BZ-12960 Copy the current lifecycle cash flow chart to the project details tab
  BZ-12750: assure that a user's location is cached properly
  BZ-13134 changed project details cash flow copy and column arrangement
  BZ-12901: Remove require validation for job role field, and add it to first and last name
  BZ-12901: Remove require validation for job role field
  BZ-12960 Copy the current lifecycle cash flow chart to the project details tab
  BZ-13016:Removing oneself from a project lands the user on the old projects list page
  BZ-13123:Finance Estimate in EBP does not Update
  BZ-13050 src/main/js/noesis/bootstrap/savingsEstimator/controllers/estimatesController.js
  BZ-13131 No visual validation for missing phone number on branding settings pop up on estimate download
  BZ-13102: Chnage the way to get the current company for the participants panel
  BZ-12960 Copy the current lifecycle cash flow chart to the project details tab
  BZ-12960 Copy the current lifecycle cash flow chart to the project details tab
  BZ-12960 Copy the current lifecycle cash flow chart to the project details tab
  BZ-12960 Copy the current lifecycle cash flow chart to the project details tab
  ...
BZ-13056:Chnage to show dashes on Manintenance/Non-Utility when no data is enter
Merge branch 'RC20140807' into release-candidate
Merge branch 'RC20140807' into release-candidate
BZ-12976 changed dependency
Merge remote-tracking branch 'origin/release-candidate' into integration

* origin/release-candidate:
  BZ-12976 changed dependency
  BZ-13056:Chnage to show dashes on Manintenance/Non-Utility when no data is enter
  BZ-13103 fixed date shift
  BZ-13103 fixed shifting date
  BZ-13123:Finance Estimate in EBP does not Update
  BZ-13123:Finance Estimate in EBP does not Update
  BZ-13093:Prepared on date on financing tab is static
  BZ-13100: Certain Savings Estimates will not download
  BZ-13093:Prepared on date on financing tab is static