# Conflicts:
#	dev/src/lang/zh.json
#	dev/src/view/addDevice/v_wifiAddHelp.js
#	dev/src/view/device/v_index.js
#	dev/src/view/device/v_opendoorRecord.js
#	dev/src/view/device/v_remoteOpendoor.js
#	dev/src/view/doorlockManage/v_editName.js
#	dev/src/view/doorlockManage/v_index.js
#	dev/src/view/doorlockUsers/v_index.js
#	dev/src/view/login/v_index.js
#	web/lib/js/p.js
#	web/resources/lang/zh.json
#	web/view/device/index.html
#	web/view/doorlockUsers/index.html
#	web/view/myInfo/index.html