Initial server work
This is bad
Added common area
preliminary
Some refactoring
Merge branch 'cwork'

Conflicts:
	client/core.py