Merge branch 'master' into Dustin
formatting changes, small ux fixes.
Merge branch 'Dustin'
Merge branch 'master' into Dustin
reset warranty var when new shingle is selected.
Merge branch 'Dustin'
Merge branch 'master' into marty