local settings file in new branch
basic video conferencing example
fixed bug where has_pending_request was not set in signal handler
added field for pending video requests in the django built-in admin interface
some stuff i dunno
Merge branch 'master' into dev-kante
crap
Conflicts:
	portal/settings.py
	portal/studies/views.py
Merge branch 'dev-kante'