Merge branch 'master' into marty
Merge branch 'master' into marty
Merge branch 'master' into marty
fixed some search crashes, tear-off logic, and customer save/edit bugs
Merge branch 'marty' - resolved conflicts in the selectwarranties action

Conflicts:
	main.wire
Merge branch 'Dustin'
Merge branch 'master' into Dustin