Merge branch 'dev' into thy
decorate forum-index, add page rolling function to the team_display
Merge branch 'thy' into dev