Added server keep-alive and address monitoring
Merge branch 'master' of https://github.com/kabbi/wonderland

Conflicts:
	module/dht.m