forum, events pages setup
Merge branches 'master' and 'dev'