Facebook stuff in URLs and settings
Merge branch 'master' of github.com:txsl/hackEdu

Conflicts:
	hacked/urls.py