Data#40_yuanzhe:add new api for update actions
Merge branch 'Data' of ssh://github.com/IbpTeam/demo-rio into Data#40_yuanzhe
Merge pull request #127 from v11985/data#40_wangfeng

Modify getAll to exclude deleted data -> yuanzhe
Merge pull request #128 from v11985/data#40_wangfeng

Modify findByPath to exclude deleted data ->yuanzhe
Merge branch 'Data' of ssh://github.com/IbpTeam/demo-rio into Data#40_yuanzhe
Data#40_yuanzhe:modify new api for update sync
Merge pull request #130 from huyuanzhe/Data#40_yuanzhe

Data#40 yuanzhe->xiquan
fixAPIbug-wangyu: fix get data directory bug
Merge pull request #131 from IbpTeam/fixAPIbug-wangyu

fixAPIbug-wangyu->wangfeng
OK
Add git merge demo and add devices table in DB