Merge branch 'develop' of github.com:RocketChat/Rocket.Chat into develop

.meteor/packages

.meteor/versions

HISTORY.md

README.md

client/startup/startup.js

package.json

packages/rocketchat-api/server/settings.js

packages/rocketchat-api/server/v1/misc.js

packages/rocketchat-cas/cas_server.js

...etchat-channel-settings/client/lib/ChannelSettings.coffee

...rocketchat-channel-settings/client/lib/ChannelSettings.js

...tchat-channel-settings/client/startup/messageTypes.coffee

...ocketchat-channel-settings/client/startup/messageTypes.js

.../rocketchat-channel-settings/client/startup/tabBar.coffee

...ages/rocketchat-channel-settings/client/startup/tabBar.js

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

...cketchat-channel-settings/client/views/channelSettings.js

packages/rocketchat-channel-settings/package.js

...nnel-settings/server/functions/saveRoomDescription.coffee

...-channel-settings/server/functions/saveRoomDescription.js