worked on user
Merge branch 'master' of https://github.com/Alan502/friendlycommuter

Conflicts:
	cast_Lead/models.pyc