Merge remote-tracking branch 'origin/master' into mentions

README.md

client/lib/collections.coffee

client/stylesheets/base.less

client/views/app/chatWindowDashboard.coffee

client/views/app/sideNav/channels.coffee

client/views/app/sideNav/channels.html

client/views/app/sideNav/createChannelFlex.coffee

client/views/app/sideNav/createChannelFlex.html

client/views/app/sideNav/listChannelsFlex.coffee

client/views/app/sideNav/listChannelsFlex.html

client/views/app/sideNav/sideNav.coffee

client/views/app/sideNav/sideNav.html

client/views/avatar/avatar.coffee

client/views/login/services.coffee

client/views/login/services.html

client/views/username/prompt.coffee

client/views/username/prompt.html

i18n/en.i18n.json

i18n/pt.i18n.json

public/images/rocket-card.png