Merge remote-tracking branch 'ecometrica/master'

Conflicts:
	multisite/middleware.py
	setup.py
replace models.CurrentSiteManager by managers.CurrentSiteManager in
PathAssistedCurrentSiteManager