Initial server work
Added common area
Some refactoring
Merge branch 'cwork'

Conflicts:
	client/core.py