Fixed the user module template about _user-media.phtml
Merge branch 'user' into user-adivspan
Merge pull request #482 from adivspan/user-adivspan

User adivspan