Merge branch 'development'
Updates from earlier
Merge branch 'master' of surprisehighway.beanstalkapp.com:/kalamazoo into dev_mage
Adding a new offline payment type for International transactions
My projects section - add items, yeah.

Signed-off-by: Philip Zaengle <philip@philipzaengle.com>
Worked on the Design Center

Signed-off-by: Philip Zaengle <philip@philipzaengle.com>
added several resource images

Signed-off-by: Philip Zaengle <philip@philipzaengle.com>
Added authorizenet override, international order option for payment, still needs to be tweaked
Merge branch 'dev_ee' of surprisehighway.beanstalkapp.com:/kalamazoo into dev_mage
Added cart link to site header, custom view file for catalog pages
Updates to the catalog view continued
Overrode select custom option field to simplify UX, almost done with catalog/customization template
Moved CSS from product/view to main CSS file
Updated product/view and upsell so upsell only displayed in catalog module, upsell CSS fixed, upsell pids added
The fancy new image sizer for Tristan.

Signed-off-by: Philip Zaengle <philip@philipzaengle.com>
a new module that helps in editing playa relationships.

Signed-off-by: Philip Zaengle <philip@philipzaengle.com>
added an encryption key, for use in the playa edit module. rad I know.

Signed-off-by: Philip Zaengle <philip@philipzaengle.com>
a bunch of new little trinkets for the list functionality. that was a lot of work.

Signed-off-by: Philip Zaengle <philip@philipzaengle.com>
Merge branch 'dev_ee' into development
Merge branch 'dev_ee'