cm
Merge branch 'master' of https://github.com/areskts/workspaces

Conflicts:
	xdeveloper/xdeveloper-zookeeper/src/main/java/jjwu/xdeveloper/zookeeper/curator/ZkCacheClient.java
	xdeveloper/xdeveloper-zookeeper/src/test/java/jjwu/xdeveloper/zookeeper/AppTest.java