Add lxml test dependency and remove Python 2.6 support
Fix quoting URL params for unicode strings
Add public dir to repo
Remove integration test for time being
Switch default marketplace to GB, use GB instead of UK for consistency, add delete merchant view, template, url, add debug logging statements

Conflicts:
	oscar_mws/api.py
Add logging to test configuration
Fix storing shipping events for fulfillment orders
Update dashboard template for fulfillment orders
Update logging settings
Merge upstream