Merge branches 'jeffrey-dev' and 'master' of github.com:xHFT/pencilme-dev
Merge branches 'jeffrey-dev' and 'master' of github.com:xHFT/pencilme-dev
Merge branches 'jeffrey-dev' and 'master' of github.com:xHFT/pencilme-dev into jeffrey-dev
show choice display in template pages