Merge branch 'master' into marty
Merge branch 'master' into Adam-Jones
Merge branch 'master' into marty
added isNan to input fields for Roof Info
Merge branch 'Adam-Jones'
Merge branch 'master' into Adam-Jones
Fixed crash when generating estimate with blank fields
Merge branch 'marty'
Merge branch 'master' into marty
Fucked up commit
Revert "Fucked up commit"

This reverts commit 222a890aa2cdcc346b6b5956de0c0fc33529623d.
added code back in to show product images
Merge branch 'marty'
Merge branch 'master' into marty
Correction of Pager padding issue

resulted in scrollbar on top of content.
Merge branch 'Adam-Jones'
Merge branch 'master' into Adam-Jones
correct padding issues in Select a Color
Merge branch 'Adam-Jones'
Made some other changes to fix crashing on gen estimate in summary page