link URL fix & restored default cart for gifts due to strange bug
removed USA phone from contact
fixed latest conekta error due to changing promo code field name
fixed needless accent in order success page
more success text mods
another type on order success

now that we're integrating pademobile, these mods are actually timely
pademobile pretty much implemented

-but with one-time payments only, and not exposed as option until can
save shipping info on some db
-also fixed locale pathname check, since payment also has 'en' in it
somewhat stable data model setup & rough dashboards

-rough customer & admin dashboards created & routing appropriately
(locales mostly working, but pages not translated)
-product & product items not yet integrated (tho serve as examples for
original scaffold)
-BUG: subscribe page now loading images twice for some reason
rake assets:clean removed strange subscribe page errors woohoo!

also removed scaffolds css, since i won't be using it
successfully passing shipping info from JS->controller

woohoo!!!
fixed the outdated URL checking for empty conekta cart
partial subscription copying coded

but need to switch back to master to fix conekta parsing of promo code
bug!
CMing partial subscription copying to switch back to master
a lot more progress in fleshing out dashboard logic

& integrating with conekta cart
-not fully done w/ product item creation from subscriptions controller,
but gotta switch to master to verify mcb.com w/ google apps right now
Merge branch 'dashboard' of https://github.com/amyfan/MyCoffeeBox into dashboard

Conflicts:
	app/assets/stylesheets/all/_global.sass
	app/cells/payment/manage.html.haml
	app/cells/payment_method/display.html.haml
	app/cells/shipment/manage.html.haml
	app/cells/shipping_info/display.html.haml
	app/cells/shipping_info/manage.html.haml
	app/cells/subscription/display.html.haml
	app/cells/subscription/manage.html.haml
	app/cells/user/display.html.haml
	app/controllers/product_items_controller.rb
	app/controllers/products_controller.rb
	app/controllers/shipping_infos_controller.rb
	app/controllers/subscriptions_controller.rb
	app/models/product.rb
	app/models/subscription.rb
	app/views/dashboards/index_admin.html.haml
	app/views/product_items/edit.html.haml
	app/views/product_items/new.html.haml
	app/views/product_items/show.html.haml
	app/views/products/_form.html.haml
	app/views/products/edit.html.haml
	app/views/products/new.html.haml
	app/views/products/show.html.haml
	app/views/static_pages/payment_option.haml
	app/views/subscriptions/_form.html.haml
	config/routes.rb
	db/migrate/20130724014539_create_subscriptions.rb
	db/migrate/20130724034730_create_products.rb
	db/schema.rb