Add git merge demo and add devices table in DB
Merge pull request #132 from v11985/data#40_wangfeng

Add git merge demo and add devices table in DB ->yuanzhe
Data#40_yuanzhe:modify dao api,when update one data item,could use a object to update, instead of key value
Merge branch 'Data' of ssh://github.com/IbpTeam/demo-rio into Data#40_yuanzhe
Data#40_yuanzhe:fix token bug
Merge branch 'Data' of ssh://github.com/IbpTeam/demo-rio into Data#40_xiquan
fix a bug
Merge pull request #134 from huyuanzhe/Data#40_yuanzhe

Data#40 yuanzhe -> wangfeng
OK
Merge pull request #135 from v11985/data#40_wangfeng

fix a bug
Merge branch 'Data' of ssh://github.com/IbpTeam/demo-rio into Data#40_xiquan