Merge branch 'user' into user-adivspan
Fixed the user module front template
Merge branch 'user' into user-adivspan
Merge branch 'user' into user-adivspan
Merge pull request #489 from adivspan/user-adivspan

Fixed the user module front template