Adds stock and image migration for products
adds carrierwave to products
Working photo uplaods. YAY
merge master into categories