Merge remote-tracking branch 'origin/master' into jalik-ufs

.meteor/packages

.meteor/versions

README.md

build-android.sh

build-ios.sh

build.sh

client/routes/router.coffee

client/stylesheets/base.less

client/views/admin/adminStatistics.coffee

client/views/admin/adminStatistics.html

client/views/admin/users/adminUserChannels.coffee

client/views/admin/users/adminUserChannels.html

client/views/admin/users/adminUserEdit.coffee

client/views/admin/users/adminUserEdit.html

client/views/admin/users/adminUserInfo.coffee

client/views/admin/users/adminUserInfo.html

client/views/admin/users/adminUsers.coffee

client/views/admin/users/adminUsers.html

client/views/app/room.coffee

client/views/app/sideNav/directMessagesFlex.html