Conflicts:
	pithos/__init__.py
	pithos/api/management/commands/__init__.py
	pithos/backends/lib/rabbitmq/__init__.py
	pithos/backends/lib/rabbitmq/queue.py
	pithos/lib/user.py
	pithos/middleware/user.py
	pithos/settings.py
	pithos/ui/__init__.py
	pithos/ui/urls.py
	pithos/ui/views.py
	snf-pithos-app/pithos/api/settings.py
	snf-pithos-app/pithos/middleware/log.py
	snf-pithos-app/pithos/middleware/user.py
	snf-pithos-app/pithos/ui/settings.py
	snf-pithos-app/pithos/ui/templates/feedback_mail.txt
	snf-pithos-app/pithos/ui/views.py
	snf-pithos-lib/pithos/lib/__init__.py
	snf-pithos-tools/pithos/__init__.py
	snf-pithos-tools/pithos/tools/dispatcher.py