Merge branch 'master' into marty
Bad commit
Revert "Bad commit"

This reverts commit 6a0fae63d7e678de44c7a9dc7cebd46d1d95e24c.
Revert e90c5f7..cf73d78

This rolls back to commit e90c5f76f1c1d04d8ee66035b18b7399f3e4821a.
Dustin's version
Estimate PDF now displays, edit customer functionality restored
Merge branch 'marty' resolving conflicts

Conflicts:
	main.wire
removing images
Cleaned up some of the alerts
Merge branch 'marty'
Merge branch 'Dustin'
Merge branch 'master' into Dustin