Mattermost features

Merged Victor Wu requested to merge lattermost-features into master