Merge remote-tracking branch 'origin/master' into storm_wxf
Merge branch 'storm_wxf' of https://github.com/GiantZtgame/stormRTDev into storm_wxf

Conflicts:
	Storm_qule/src/main/java/storm/qule_game/bolt/LvdistCalcBolt.java
	Storm_qule/src/main/java/storm/qule_game/bolt/LvdistVeriBolt.java
temp merge from master 20141010
Signed-off-by: zhanghang <455419520@qq.com>
test
Signed-off-by: zhanghang <455419520@qq.com>
Merge branch 'storm_wxf' of git@github.com:GiantZtgame/stormRTDev.git

Conflicts:
	Storm_qule/src/main/java/storm/qule_game/bolt/LvdistCalcBolt.java
Merge branch 'storm_zh' of git@github.com:GiantZtgame/stormRTDev.git