代码中的tab转换为4空格
之前提交用户邮箱写错，github不识别
Merge branch 'master' of https://github.com/leonyux/jstorm-kafka

Conflicts:
	src/jvm/storm/kafka/PartitionManager.java