adding generic admin
Merge branch 'master' of github.com:TracyWebTech/opps-wiki

Conflicts:
	opps/wiki/models.py