update DeviceInfor.py
Merge branch 'master' of https://github.com/ngotuan12/eAlarm

Conflicts:
	eAlarm/urls.py
                                             Merge branch 'master' of https://github.com/ngotuan12/eAlarm

Conflicts:
	myapp/templates/add-device-property.html
	myapp/templates/edit-device-property.html