Merge branch 'point' into dev
point.html add in dev branch
Merge branch 'dev'