first admin commit
Merge branch 'master' into admin
Merge branch 'master' into admin

Conflicts:
	wsgiwars/views.py
Better admin interface
Merge branch 'master' into admin

Conflicts:
	wsgiwars/views.py