Merge branch 'master' into statistics

.codeclimate.yml

README.md

client/lib/cordova/keyboard-fix.coffee

client/stylesheets/base.less

client/views/admin/admin.coffee

client/views/admin/admin.html

client/views/app/room.coffee

client/views/app/sportlight/mobileMessageMenu.coffee

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

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

server/methods/deleteMessage.coffee

server/methods/updateMessage.coffee

server/startup/avatar.coffee