v1.0.6_J_20141106

ThirdActivity Updated
v1.0.6_J_20141106_1

fix conflict