Merge branch 'PM2Way'
BZ-12232 Customize primary logo used in estimates
Merge branch 'master' of github.com:NoesisEnergy/bootstrap
BZ-12528: PSE now has marketing ad in place
Merge branch 'PM2Way'
BZ-12694: Stop Project Proposal download indicator on download
BZ-12528: marketing ad page change
Merge branch 'master' into integration