add some restrict to useredit page & view page
add a picture
Merge remote-tracking branch 'origin/zyz' into raysmond
Merge branch 'raysmond'
Fix bugs in user profile changing
Merge branch 'raysmond'
fix bugs
Merge branch 'raysmond'
add user picture
Merge branch 'raysmond'
modify database model
Merge branch 'raysmond'
Merge branch 'group' of https://github.com/junshiguo/FDUGroup into junshiguo-group

Conflicts:
	arch/modules/group_categories/group_categories.module
Merge branch 'junshiguo-group'
Merge branch 'master' into raysmond
update message view
Merge branch 'raysmond'
add group search functionality. pager bugs fixed.