Set master branch to depend on Spree v3.0.0.beta
Rework layout for master branch on bootstrap.

Some cosmetic layout adjustments still needed for the frontend.