changed server and client code

trimmed excess code and simplified.
Merge branch 'master' of https://github.com/Betweex/Radar

Conflicts:
	index.html