BZ-12750: corrected default location to correct austin coordinates
Merge remote-tracking branch 'origin/Sprint74-PP' into release-candidate

* origin/Sprint74-PP:
  BZ-12750: corrected default location to correct austin coordinates
Merge remote-tracking branch 'origin/RC20140724' into release-candidate

* origin/RC20140724:
  BZ-13002: Add validation to show errors on form
  BZ-12937 the Financed LIfecycle Savings calculation does not change when modifying the Term Length
  BZ-13003: added css class for footer logos on estimators
  BZ-12619 Order the content of the Explore page by 'date published' instead of by 'date created.'
  BZ-12919: change styles for number labels and remove contact info from the footer
  BZ-12773: Change height of the fram to avoid broken background while deleting an incentive
  BZ-12753 Shared project date status shows shared x ago according to when project was created.
  BZ-11890: Update estimators to use neGoogleMap/neStreetView in readOnly mode on view only page
  BZ-12872 Blog is showing some unpublished content
  BZ-12919: Ui changes to the finances estimate to remove 'Lease' language
  BZ-12257 adjusted link to help page
  BZ-12934 handle case with 0 meters
  BZ-11430 added email link cliked trackpoint
  BZ-11430 added email link cliked trackpoint
  BZ-12849 Lifecycle Maintenance Costs in EBP
  BZ-12908 Bottom border on amount slider is missing on Project Savings Estimates
  BZ-12215: retrofit meter's unit to neSelect
  BZ-12916: nePortfolio directive test
Merge branch 'EBP_Flow_Improvements' into release-candidate

Conflicts:
	.idea/workspace.xml
	src/main/js/noesis/bootstrap/portfolio/templates/neCreateFacilityPage.html
	src/main/js/noesis/bootstrap/projects/controllers/addECMController.js
	src/main/js/noesis/bootstrap/projects/directives/addECM.html
	src/main/js/noesis/bootstrap/projects/directives/addProjectPage.html
	src/main/js/noesis/bootstrap/projects/directives/details/tabs/neSummaryPage.html
BZ-0000: Fix build error
BZ-12993 changed t&c link on create acct page
Merge branch 'estimate-word-templates' into release-candidate

Conflicts:
	src/main/js/noesis/bootstrap/financeEstimator/controllers/financeController.js
	src/main/js/noesis/bootstrap/financeEstimator/services/financeService.js
	src/main/js/noesis/bootstrap/savingsEstimator/controllers/estimatesController.js
	src/main/js/noesis/bootstrap/savingsEstimator/directives/estimatePreview.js
	src/main/js/noesis/bootstrap/savingsEstimator/directives/neEstimatePreview.html
	src/main/js/noesis/bootstrap/savingsEstimator/directives/pieChartEstimate.js
Merge branch 'RC20140724' into release-candidate
Merge remote-tracking branch 'origin/production' into release-candidate

* origin/production:
  BZ-13003: added css class for footer logos on estimators
Merge branch 'EBP_Flow_Improvements' into release-candidate
Merge branch 'release-candidate' of https://github.com/NoesisEnergy/bootstrap into release-candidate
Merge branch 'EBP_Flow_Improvements' into release-candidate
Merge branch 'EBP_Flow_Improvements' into release-candidate
BZ-13026:Adding Historical data to ECM puts existing savings info in historical spend column
Merge branch 'EBP_Flow_Improvements' into release-candidate

Conflicts:
	src/main/js/noesis/bootstrap/projects/directives/addECM.html
BZ-13026:Adding Historical data to ECM puts existing savings info in historical spend column
Merge branch 'EBP_Flow_Improvements' into release-candidate
BZ-12989 If a facility has no utilities, in the new ECM Wizard, select Electricity and Natural Gas by default
BZ-12866:Use new ECM Wizard in the ECM list
BZ-13044: Can't create a new portfolio on qacms