refactored the ZkProxy (now using Apache Curator by default)
clean up
Merge branch 'develop' into feature/mongodb

* develop:
  clean up
  refactored the ZkProxy (now using Apache Curator by default)