Merge branch 'develop' into slackbridge

.github/CONTRIBUTING.md

.gitignore

.meteor/packages

.meteor/versions

.sandstorm/sandstorm-pkgdef.capnp

.travis.yml

HISTORY.md

README.md

client/startup/defaultRoomTypes.coffee

client/startup/unread.coffee

packages/meteor-accounts-saml/saml_client.js

...ketchat-authorization/client/views/permissionsRole.coffee

...ocketchat-authorization/client/views/permissionsRole.html

packages/rocketchat-authorization/server/startup.coffee

packages/rocketchat-cas/cas_client.js

packages/rocketchat-cas/cas_server.js

...settings-mail-messages/server/methods/mailMessages.coffee

...chat-channel-settings/client/views/channelSettings.coffee

...hat-channel-settings/server/functions/saveRoomName.coffee

...t-channel-settings/server/methods/saveRoomSettings.coffee