Merge branch 'dev' into 'master'

js/base/config.js

page/home/home.js

page/my/password/password.html

page/my/password/password.js

page/repairManage/addDevice.html

page/repairManage/repairOnline.js

page/serverbillManage/taskComplete.js

template/serverdetail/completedbillDetail.njk

template/serverdetail/completedtaskDetail.njk

template/serverdetail/robbillDetail.njk

template/serverdetail/robtaskDetail.njk

template/serverdetail/servicebillDetail.njk

template/serverdetail/servicetaskDetail.njk

template/serverdetail/waitbillDetail.njk

template/serverdetail/waittaskDetail.njk