detect category selection conflict
merge test
merge test
detect category selection confict

Conflicts:
	.DS_Store
	knoatom/settings.py
	south.pl
	web/admin.py