Merge branch 'user' into user-adivspan
Merge branch 'user' into user-adivspan
Completed received comments list page
Merge branch 'user' into user-adivspan
Completed front-end of portal page
Added message for empty user
Fixed the pages about register, login and password
Fix for role assignment
Merge branch 'user' into user-adivspan
Merge branch 'user' into user-adivspan
Fix timle line and some bug
Merge pull request #459 from sexnothing/user

User list in uclient module
Merge remote-tracking branch 'upstream/user' into user
Merge pull request #460 from liuchuangww/user

User
Merge branch 'user' of https://github.com/linzongshu/pi-1 into linzongshu-user

Conflicts:
	usr/module/comment/template/front/comment-list.phtml
	usr/module/comment/template/front/comment-user-received.phtml
	usr/module/comment/template/front/comment-user.phtml
Uclient role assignment
Fixed login css
Merge branch 'user' into user-adivspan
Revert "Completed front-end of portal page"

This reverts commit 39dc6b938c6bf52563c73e37aa63b40d91010a7b.
Merge pull request #461 from adivspan/user-adivspan

User adivspan