Merge branch 'master' into typing

.meteor/packages

.meteor/versions

README.md

app.json

client/stylesheets/base.less

client/stylesheets/global/_variables.less

client/views/app/home.html

client/views/app/layout.coffee

client/views/app/layout.html

client/views/app/privateHistory.html

client/views/app/room.coffee

client/views/app/room.html

client/views/app/settings.html

client/views/app/sideNav/userStatus.html

i18n/ru.i18n.json

packages/rocketchat-oembed/client/oembedImageWidget.html

packages/rocketchat-webrtc/adapter.js

packages/rocketchat-webrtc/common.js

packages/rocketchat-webrtc/package.js

packages/rocketchat-webrtc/server.js