made tests for alerts in product edit page
styling product edit page
finished styling product edit page
there is an issue with the order items
still broken, switching to master and praying the problem isn't there also...
rake reset
fixed merge conflicts
Merge branch 'master' into promo_format