Merge branch 'master' into Dustin
Warranty/tear off required bugs
Merge branch 'Dustin'
Merge branch 'master' into Dustin
Tear off bug
Merge branch 'Dustin'
Merge branch 'marty' - resolved conflicts in the selectwarranties action

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