2 2 stable

I tried to use the 2-2-stable branch, and had a couple of problems:
* the cart form couldn't add the variant to the order
* uploading images failed in the Admin OptionTypes edit screen

This pull request fixes both of those problems.