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
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
remove the username and password for security and fix merge error.