Merge branch 'ltolias'
pyc
Merge branch 'ltolias' CAS WORKS WOHOOO

Conflicts:
	roommeet-1/roommeet/settings.pyc
Merge branch 'ltolias'
Merge branch 'ltolias'
Merge branch 'ltolias'
adding fb app to room meet
Merge branch 'master' of https://github.com/dschen/roommeet

Conflicts:
	roommeet-1/people/models.pyc
	roommeet-1/roommeet/settings.pyc
Merge branch 'master' into ltolias