Merging from 0.x to stable/0.2.x for 0.2.2 release
Conflicts:
	debian/changelog
	setup.py
	storage_service/locations/views.py