keep-alive client and server
	modified:   CABDaemon.cpp
	modified:   cab_client.py
Merge branch 'master' of github.com:Zishuo/CAB_SDN_HELPER

Conflicts:
	cab_client.py