Feature/discussionboard

Isn't this related to the Merit branch? Or was it included with this one for something?