Merge branches 'jeffrey-dev' and 'master' of github.com:xHFT/pencilme-dev into jeffrey-dev
Merge branches 'jeffrey-dev' and 'master' of github.com:xHFT/pencilme-dev into jeffrey-dev
remove the username and password for security and fix merge error.
Merge branches 'jeffrey-dev' and 'master' of github.com:xHFT/pencilme-dev
add the google contacts import API and add a test import page.
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
add Sharethis buttons for fb/tw/g+/linkedin
clean useless code
Merge branches 'jeffrey-dev' and 'master' of github.com:xHFT/pencilme-dev