use the html view replace ejs
Merge remote branch 'origin/master'