More stuff
Merge branch 'master' of https://github.com/vanoosbree/epstein

Conflicts:
	apps/login/views.py
	apps/login/views.pyc
	apps/users/views.pyc
	epstein/settings.pyc
	epstein/urls.py
	epstein/urls.pyc
Blah blah