Merge branch 'master' into Dustin
Merge branch 'master' into marty
Completed deleting before saving actions
Merge branch 'Dustin'
Removed alerts and color backgrounds on product create.  Also removed flickering that would happen on create.
Merge branch 'marty'

This reverts commit d8d30ca56a4f850e6ba64bd72556a4f25817a60b, reversing
changes made to d11d504d7f855d17162756e001eca3568658a089.
Resovled conflich
Merge branch 'Adam-Jones'
Merge branch 'master' into Adam-Jones