weird problem
Merge branch 'master' into ltolias

Conflicts:
	roommeet-1/roommeet/views.pyc