Merge branches 'jeffrey-dev' and 'master' of github.com:xHFT/pencilme-dev into jeffrey-dev
show choice display in template pages
add Sharethis buttons for fb/tw/g+/linkedin
clean useless code
Merge branches 'jeffrey-dev' and 'master' of github.com:xHFT/pencilme-dev