Merge branch 'master' into issue/584/charfieldswithnull

Conflicts:
	oscar/apps/address/abstract_models.py
	oscar/apps/catalogue/abstract_models.py
	oscar/apps/customer/abstract_models.py
	oscar/apps/order/abstract_models.py
	oscar/apps/partner/abstract_models.py