Merge branch 'develop' into smarsh-timezone-addition

.docker/develop/Dockerfile

.docker/latest/Dockerfile

.eslintignore

.eslintrc

.meteor/.finished-upgraders

.meteor/packages

.meteor/release

.meteor/versions

.travis.yml

.travis/docker.sh

package.json

packages/autoupdate/autoupdate_cordova.js

packages/autoupdate/package.js

...ges/meteor-accounts-saml/.npm/package/npm-shrinkwrap.json

packages/rocketchat-assets/.npm/package/npm-shrinkwrap.json

packages/rocketchat-cas/.npm/package/npm-shrinkwrap.json

packages/rocketchat-cors/cors.coffee

packages/rocketchat-crowd/.npm/package/npm-shrinkwrap.json

...s/rocketchat-file-upload/.npm/package/npm-shrinkwrap.json

packages/rocketchat-file/.npm/package/npm-shrinkwrap.json