Merge branch 'user' into user-adivspan
Merge branch 'user' into user-adivspan
Fixed user custom template
Merge pull request #571 from adivspan/user-adivspan

Fixed user custom template