update DeviceController
Merge branch 'new-ui-module'
slove confict

Conflicts:
	iFind/DeviceDetailViewController.m
button 与数据库关联