modifty scan view controller
Merge branch 'working-1'
modify scan view controller
Merge branch 'working-2'
Merge branch 'working-1'
modify device view controller
sql manager
Merge branch 'master' into working-2
modify deviceDetailviewtroller
修改