added blockers to products and main nav to control workflow
Merge branch 'Dustin'
Added mocked up estimate pdf and resolvd conflicts
Merge branch 'master' into marty