removed cserved_communicator
removed unnecessary makefile command
refactoring deprecated content server
Merge branch 'master' of https://github.com/metacademy/metacademy-application

Conflicts:
	server/static/lib/kmap