Merge branch 'master' into administration

client/lib/cordova/push.coffee

client/startup/unread.coffee

client/stylesheets/base.less

client/views/app/privateHistory.coffee

client/views/app/privateHistory.html

client/views/app/room.coffee

client/views/app/room.html

client/views/app/sideNav/chatRoomItem.coffee

client/views/app/sideNav/createChannelFlex.coffee

client/views/app/sideNav/directMessagesFlex.coffee

client/views/app/sideNav/privateGroupsFlex.coffee

client/views/app/userCard.coffee

client/views/app/userCard.html

packages/rocketchat-autolinker/autolinker.coffee

packages/rocketchat-lib/server/sendMessage.coffee