making extra page show up.
Merge branch 'master' of https://github.com/blueroot/spree_designer_dashboard

Conflicts:
	spree_designer_dashboard.gemspec