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
Fix the ; error
Merge pull request #92 from wjmjimmie/br#40+jimmie

Data#40_jimmie->xiquan
Monitor resource dir exclude .git
Merge pull request #93 from v11985/data#40_wangfeng

Monitor resource dir exclude .git ->yuanzhe
Merge branch 'Data'
Remove node-webkit-v0.8.4 from app source
Merge pull request #94 from shuanzi/Data#40_xiquan

Data#40_xiquan->wangfeng
OK
Move node_modules into other git repo. Add dep into package.json
add .gitignore
Merge Data new log.