modified production.py
Merge branch 'vinny' of github.com:xHFT/pencilme-dev into vinny

Conflicts:
	pencilme/pencilme/settings/production.py
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
Google calendar API and a simple view.
update the simple view of google calendars
Merge branches 'jeffrey-dev' and 'master' of github.com:xHFT/pencilme-dev
delete useless files
Merge branches 'jeffrey-dev' and 'master' of github.com:xHFT/pencilme-dev into jeffrey-dev
add default_if_none tag
Merge branches 'jeffrey-dev' and 'master' of github.com:xHFT/pencilme-dev into jeffrey-dev
add color support for test google calendar 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
Merge branch 'master' into vinny
added pending events template
re-modified event.html
intermediate commit
Merge branches 'jeffrey-dev' and 'master' of github.com:xHFT/pencilme-dev into jeffrey-dev