userpage controller and factor
userpage controller and factor
fix merge conflict
Merge pull request #90 from lpappone/master

userpage controller and factor