Merge branch 'master' into marty
Merge branch 'master' into marty
Revert 646a0b3..dcea241

This rolls back to commit 646a0b322a48238ff933eee7b0486a924f72e318.
Commented out alerts
Merge branch 'Dustin' into marty
Removed alerts and added mocked up PDF for estimate
Added mocked up estimate pdf and resolvd conflicts