Merged 'develop' into 'mockup'

Conflicts:
	app/controllers/plazr_store/admin/application_controller.rb
	app/controllers/plazr_store/admin/products_controller.rb
	app/controllers/plazr_store/admin/variants_controller.rb
	app/controllers/plazr_store/pages_controller.rb
	app/models/plazr_store/product.rb
	app/models/plazr_store/variant.rb
	app/views/layouts/application.html.erb
	app/views/plazr_store/admin/products/_form.html.haml
	app/views/plazr_store/admin/variants/_form.html.haml
	app/views/plazr_store/shared/_nav.html.erb
	config/routes.rb
	test/dummy/lib/tasks/populate.rake