some basic admin with check by name
Merge remote-tracking branch 'origin/master'

Conflicts:
	handlers.py
conflicts