Merge branch 'master' into marty
Merge branch 'master' into marty
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 'Adam-Jones'
Merge branch 'master' into Adam-Jones