Merge branches 'jeffrey-dev' and 'master' of github.com:xHFT/pencilme-dev into jeffrey-dev
make the allauth support google calendar
Merge branches 'jeffrey-dev' and 'master' of github.com:xHFT/pencilme-dev