remove spaces
store user id in session not the whole user object
Merge branch 'django1.6'