Merge branch 'master' of github.com:RocketChat/Rocket.Chat

.gitignore

build.sh

client/lib/RoomHistoryManager.coffee

client/lib/avatar.coffee

client/lib/flexTab.coffee

client/lib/notification.coffee

client/lib/sideNav.coffee

client/methods/openRoom.coffee

client/routes/adminRouter.coffee

client/routes/roomRoute.coffee

client/routes/router.coffee

client/startup/startup.coffee

client/stylesheets/base.less

client/views/account/account.coffee

client/views/admin/admin.coffee

client/views/admin/rooms/adminRooms.coffee

client/views/admin/users/adminUserEdit.coffee

client/views/admin/users/adminUserInfo.coffee

client/views/admin/users/adminUserInfo.html

client/views/admin/users/adminUsers.coffee