empty template page
Merge branch 'master' of https://github.com/RalphSu/pjm2
layout change for content; scroll side bar
merge; show user edit buton
merge