Merge branch 'master' into develop
update adb to 1.0.31 per http://forum.xda-developers.com/showthread.php?t=2047891
comment previous zookeeper_server host in config
fix error
Merge branch 'release/v0.1'