template helper
Merge branch 'master' of https://github.com/RalphSu/pjm1
Merge branch 'master' of https://github.com/RalphSu/pjm2
template page
Merge branch 'master' of https://github.com/RalphSu/pjm2
ui tweak
merge