added changes
Merge branch 'master' of github.com:blueroot/spree_designer_dashboard