Merge

and some code in the forum_model