add spree_pages to configuration sidebar
Move override to main app since it's an admin function
added the quick map with the modal feature in bootstrap. removed blue text from the site.
integrate pages and mercury
fix display property for @vickief's modal. it was interfering with the DOM
updating the styles for the terms and conditions/ FAQ page.
Merge branch 'theming' of github.com:SalzmanGroup/spree_bootstrap into theming
adding styles for the static pages.
order shipping rates by cost lo -> hi
Merge branch 'theming' of github.com:SalzmanGroup/spree_bootstrap into theming
set width for cart images. May need to reprocess paperclip. helps fix SalzmanGroup/Lavazza#58
updates to the Terms& conditions/FAQ  styling. fixing the missed blue numbers
Merge branch 'theming' of github.com:SalzmanGroup/spree_bootstrap into theming

Conflicts:
	app/assets/stylesheets/store/custom.css
fix newsletter checkbox
fix line item image size
max of 50 for cart qty
Merge branch 'theming' of github.com:SalzmanGroup/spree_bootstrap into theming
adding styles for the FAQ.
Merge branch 'theming' of github.com:SalzmanGroup/spree_bootstrap into theming
cart button management for items without variants. Fixes SalzmanGroup/lavazza#60