Merge remote-tracking branch 'origin/master'

Conflicts:
	Storm_qule/src/main/java/storm/qule_game/LvdistTopology.java
Merge remote-tracking branch 'origin/storm_wxf'
Merge remote-tracking branch 'origin/storm_wxf'
Merge remote-tracking branch 'origin/storm_wxf'
Merge branch 'master' of https://github.com/GiantZtgame/stormRTDev
修复留存日期bug，修改留存为每日新增用户
Signed-off-by: zhanghang <455419520@qq.com>
Merge pull request #18 from GiantZtgame/storm_zh

修复留存日期bug，修改留存为每日新增用户
修改新登ip，新登char的redis类型为set
Signed-off-by: zhanghang <455419520@qq.com>
Merge pull request #19 from GiantZtgame/storm_zh

修改新登ip，新登char的redis类型为set
以新登用户来计算留存
Signed-off-by: zhanghang <455419520@qq.com>
Merge pull request #20 from GiantZtgame/storm_zh

以新登用户来计算留存
temp merge from master 20141010