work
Merge branch 'master' of github.com:happyoperator/operator

Conflicts:
	operator-server/__init__.py