merge
Merge branch 'master' of https://github.com/dschen/roommeet

Conflicts:
	web/roommeet/roommeet/__init__.pyc
	web/roommeet/roommeet/settings.pyc
	web/roommeet/roommeet/urls.pyc
	web/roommeet/roommeet/views.pyc
	web/roommeet/roommeet/wsgi.pyc