Merge remote-tracking branch 'origin/Competitive_Estimates-Create' into competitive-estimates

* origin/Competitive_Estimates-Create: (32 commits)
  BZ-12961:Whenever a quote is requested, send the Noesis Finance team an email notification
  BZ-13133:As a projects user I would like the ability to change the term length on the competitive estimates
  BZ-13133:As a projects user I would like the ability to change the term length on the competitive estimates
  BZ-13133:As a projects user I would like the ability to change the term length on the competitive estimates
  BZ-13123:Finance Estimate in EBP does not Update
  BZ-13123:Finance Estimate in EBP does not Update
  BZ-12687:Enable Pro user to select which financing vehicle is used in the the EBP
  BZ-12957:Generate competitive estimates in the Financing tab
  BZ-12958:Adjust the behavior of the competitive estimates based on characteristics of the user
  BZ-12958:Adjust the behavior of the competitive estimates based on characteristics of the user
  BZ-12958:Adjust the behavior of the competitive estimates based on characteristics of the user
  BZ-12958:Adjust the behavior of the competitive estimates based on characteristics of the user
  BZ-12958:Adjust the behavior of the competitive estimates based on characteristics of the user
  BZ-12958:Adjust the behavior of the competitive estimates based on characteristics of the user
  BZ-12687:Enable Pro user to select which financing vehicle is used in the the EBP BZ-12958:Adjust the behavior of the competitive estimates based on characteristics of the user
  BZ-12961-Change finacingteam@noesis.com to financeteam@noesis.com
  BZ-12962:Incorporate competitive estimates into Project Financing section of EBP
  BZ-12687:Enable Pro user to select which financing vehicle is used in the the EBP
  BZ-12687:Enable Pro user to select which financing vehicle is used in the the EBP
  BZ-12962:Incorporate competitive estimates into Project Financing section of EBP
  ...

Conflicts:
	src/main/js/noesis/bootstrap/projects/directives/details/tabs/neFinancing.html
Merge remote-tracking branch 'origin/release-candidate' into competitive-estimates

* origin/release-candidate: (213 commits)
  BZ-12976 changed dependency
  BZ-12960 Fix for markup
  BZ-12960 Copy the current lifecycle cash flow chart to the project details tab
  BZ-13170 link opens in a new page
  BZ-13170 links open in black page
  BZ-13170 changed link
  BZ-13056:Chnage to show dashes on Manintenance/Non-Utility when no data is enter
  BZ-13056:Chnage to show dashes on Manintenance/Non-Utility when no data is enter
  BZ-13171 Fix Mark-up issues in Finance & Savings Estimates Invite Clients Form
  BZ-13179 added Font Awesome Icon
  BZ-13133:As a projects user I would like the ability to change the term length on the competitive estimates
  BZ-13133:As a projects user I would like the ability to change the term length on the competitive estimates
  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-13084 replaced fa-money with fa-university
- reapplying after it was removed due to conflict resolution
Merge branch 'competitive-estimates' into release-candidate
Merge branch 'RC20140807' into release-candidate
BZ-12957: Fixing styles
BZ-12957: Fixing styles
Merge branch 'RC20140807' into release-candidate
BZ-13204:Change "Client" to "Prepared For" on project details
BZ-13209 merging changes to release-candidate
BZ-13222 changed rate
BZ-13213 Added tooltips
BZ-13213 Updated tooltip handling
BZ-13206:Email template needs to list lender.
Merge branch 'RC20140807' into release-candidate

Conflicts:
	src/main/js/noesis/bootstrap/projects/directives/details/tabs/neFinancing.html
BZ-13232:'All' type for the ECM causes crash with error on console, application hangs
BZ-13237:Error when downloading EBP
Merge remote-tracking branch 'origin/RC20140807' into release-candidate

* origin/RC20140807:
  BZ-13131 No visual validation for missing phone number on branding settings pop up on estimate download
  BZ-13237:Error when downloading EBP
  BZ-13206:Email template needs to list lender. Restore changes.
  BZ-13232:'All' type for the ECM causes crash with error on console, application hangs
  BZ-13209 removed spaces "Annual Payment:" & "Annual Cash Flow:"
  BZ-12957 change td width to view "5 years"
  BZ-12957 width td width to show "5 years"
Merge branch 'RC20140807' into release-candidate
Merge branch 'release-candidate' into project-proposal-sharing