Merge branch 'td0.2' into td0.1
Test exception
test
td0.2 test
Merge branch 'td0.1' into td0.2

Conflicts:
	kafka_Producer/src/main/java/new20141111test/ConsumerSample.java
啊啊
Merge branch 'td0.1' into td0.2
fff 222
sdcdws
xsxsa
Merge branch 'td0.2' into td0.1

Conflicts:
	kafka_Producer/src/main/java/new20141111test/ConsumerSample.java
dd
Merge branch 'td0.1' into td0.2

Conflicts:
	kafka_Producer/src/main/java/new20141111test/ConsumerSample.java
Merge branch 'td0.2'