Added error handling for /ping command responses
Merge branch 'master' into roomconfig

Conflicts:
	src/server_events.h