adding lots of changes to the builder
Merge branch 'master' of https://github.com/blueroot/spree_designer_dashboard