reindent html, format html to 2 space
Merge remote-tracking branch 'origin/master'