merge
Merge branch 'master' of github.com:crichon/tx

Conflicts:
	tx/settings.py
merged