Merge branch 'raysmond'
Merge branch 'raysmond'
Merge branch 'raysmond'
Merge branch 'raysmond'
Merge branch 'raysmond'
Merge branch 'raysmond'
Merge branch 'raysmond'
Merge branch 'raysmond'
Merge branch 'raysmond'
Merge branch 'raysmond'
Merge branch 'raysmond'
edit page and pager
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