meeting updates
Merge branch 'master' of https://github.com/selotape/VDC

Conflicts:
	web/base/views.py
Revert "Merge branch 'master' of https://github.com/selotape/VDC"

This reverts commit b1ffbc9863480627c1650ba5599a5285cfd35812.