Merge branch 'master' into ltolias
fix
dum de dum
fix
cas almost fixed
Merge branch 'ltolias'
Merge branch 'master' into ccweaver

Conflicts:
	roommeet-1/roommeet/settings.pyc