graphics and bug fixed
client/client sync fixed
Merge remote-tracking branch 'upstream/master'

Conflicts:
	server.js