#494 - Fix compilation problem in 3.0.4
#309 - Sale price not applied on order subtotal when no offers in system
Fixes #496 - Move Locale.orm.xml into common since that is where LocaleDaoImpl is located
Revert "#309 - Sale price not applied on order subtotal when no offers in system"

This reverts commit 9ddfa11089dacba673d93aa1aea996fd48de5e85.
#436 - Upload image in Admin 3.0 doesn't work in IE 9
#436 - Slight cleanup
Fixes #598 : A removeType of NONDESTRUCTIVEREMOVE does not work for an @AdminPresentationCollection annotated @OneToMany field
Merge remote-tracking branch 'origin/BroadleafCommerce-3.0.x' into develop