Merge branch 'master' of github.com:IbpTeam/demo-rio into #27+wangyu
Merge branch 'master' of github.com:IbpTeam/demo-rio into #27+wangyu
Merge pull request #41 from shuanzi/Data#40_xiquan

Data#40_xiquan->wangfeng
OK
Merge branch 'master' of github.com:IbpTeam/demo-rio into #27+wangyu
Merge pull request #44 from shuanzi/Data#40_xiquan

Data#40_xiquan->wangfeng
OK
Merge branch 'master' of github.com:IbpTeam/demo-rio into #27+wangyu
contactIssue#47-wangyu: fix this bug
Merge pull request #48 from IbpTeam/contactIssue#47-wangyu

Contact issue#47 wangyu->wangfeng
OK
Merge pull request #63 from shuanzi/Data#40_xiquan

Data#40_xiquan->wangfeng
OK
Merge pull request #65 from IbpTeam/Data

Recent bug.
OK
Data#40_xiquan:a backup
Data#40_xiquan:merge;add demo on index.html
Data#40_xiquan:fix conflict
Merge branch 'Data' of github.com:IbpTeam/demo-rio into Data#40_xiquan
Data#40_xiquan:add demo in index
Data#40_xiquan:fixed hashtable module
addIncrementalUploadFunction-wangyu: add incremental folder upload function
Merge pull request #89 from huyuanzhe/Data#40_yuanzhe

Data#40 yuanzhe -> wangfeng
OK
merge from yuanzhe
Merge pull request #90 from wangyufish/addIncrementalUploadFunction-wangyu

addIncrementalUploadFunction-wangyu: ->wangfeng
OK