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