[DLN-HOT-POINT] Commit Code
Merge branch 'master' of https://github.com/kikokiko00/151722441

Conflicts:
	dln-hot-point/.idea/workspace.xml
	dln-hot-point/client/web.html