Updated feature
Merge branch 'master' of https://github.com/malmostad/intranet-forum