Made some changes to servercomm.cpp
Merge branch 'new_api' of github.com:kfreezen/temp_receiver into new_api

Conflicts:
	src/ServerComm.cpp