start bootstrapifying cart
Merge branch 'upgrades-bootstrap' into order_edit_bootstrap

Conflicts:
	app/views/orders/_service_desc.html.haml