first commit of forum
pushing the forum branch, there is one bug
solved the merge conflicts