Merge branch 'master' into develop
change the format of contributor
change the sub title
change the syntax of border
Merge branch 'develop'