support custom users (django 1.5+)
support django 1.6
Merge branch 'custom_user'