4to to ec4e
Delete useless windows conf.
Merge remote-tracking branch 'origin/master' into s64fix

Conflicts:
	market/product/admin.py
trying to table (Product_product.price)