Feature/forum

Merging forum to master.. forum is already up and running