Adds some operator logic
Merge branch 'master' of /srv/operator_production/operator

Conflicts:
	operator-server/__init__.py