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
Fixed the pages about register, login and password
Merge branch 'user' into user-adivspan
Merge branch 'user' into user-adivspan
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
Merge pull request #462 from linzongshu/user

Revert "Completed front-end of portal page"
Completed timeline

Recommited the code portal page, adjusted some pages' UI, achieved the
timeline
Revert "Completed timeline"

This reverts commit 050f4a8698d6859a0a15919af8baf2d7b502a592.
Merge remote-tracking branch 'upstream/user' into user
Completed timeline

Recommitted portal page, adjusted some pages' UI