added keepalive
Merge branch 'master' of https://github.com/anlif/sanntid

Conflicts:
	ov2/network/server/server
minor