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

Conflicts:
	tx/settings.py
merged
Merge branch 'chris_dev' of github.com:crichon/tx into chris_dev
Set orderitems template
Set category template