Merged branch develop into separate-api-tests

.eslintrc

.snapcraft/edge/snapcraft.yaml

.snapcraft/launchpadkey.enc

.snapcraft/resources/Caddyfile

.snapcraft/resources/initcaddy

.snapcraft/resources/initmongo

.snapcraft/resources/initmongoreplset.js

.snapcraft/resources/rcbackup

.snapcraft/resources/startmongo

.snapcraft/stable/snapcraft.yaml

.travis.yml

.travis/snap.sh

client/startup/unread.js

client/startup/usersObserve.js

packages/rocketchat-api/server/api.js

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

...ges/rocketchat-api/server/v1/helpers/getUserFromParams.js

...at-channel-settings/client/startup/trackSettingsChange.js

packages/rocketchat-emoji-custom/client/lib/emojiCustom.js

packages/rocketchat-lib/server/models/_BaseDb.js