Merge branch 'master' into additional-md-support

.meteor/packages

.meteor/versions

README.md

client/lib/cordova/push.coffee

client/lib/notification.coffee

client/stylesheets/base.less

client/stylesheets/utils/_colors.import.less

client/views/account/accountPreferences.coffee

client/views/account/accountPreferences.html

client/views/app/flexTabBar.coffee

client/views/app/message.coffee

client/views/app/message.html

client/views/app/messagePopupConfig.coffee

client/views/app/room.coffee

client/views/app/roomSearch.html

client/views/app/tabBar/membersList.coffee

client/views/app/tabBar/uploadedFilesList.coffee

i18n/en.i18n.json

i18n/pt.i18n.json

packages/rocketchat-file/file.server.coffee