Merge pull request #1 from bondyu/master

修改了template
ci
Merge branch 'master' of https://github.com/ginano/markPage
Merge pull request #1 from ginano/master

update the trunk