Change srv_net.c
	Add func srv_net_wait_events
Merge branch 'develop'

Conflicts:
	server/srv_net.c