added server
Merge branch 'master' of github.com:tobias-engelmann/ProjectCM

Conflicts:
	src/projectcm/__pycache__/settings.cpython-34.pyc