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

.meteor/versions

client/lib/fileUpload.coffee

client/views/app/messagePopup.coffee

client/views/app/room.coffee

client/views/app/room.html

i18n/en.i18n.json

i18n/pt.i18n.json

lib/fileUpload.coffee

packages/rocketchat-lib/package.js

packages/rocketchat-lib/settings/client/rocketchat.coffee

packages/rocketchat-lib/settings/client/startup.coffee

packages/rocketchat-lib/settings/server/startup.coffee