Revert "Merge branch 'master' of https://github.com/4dminserver/adminserver"

Conflicts:
	__init__.py