This is bad
preliminary
Merge branch 'cwork'

Conflicts:
	client/core.py