Merge branch 'master' into Dustin
Deleting databases before saving for customer and roof
Merge branch 'Dustin'

Conflicts:
	main.wire
resolved conflicts
Merge branch 'master' into marty