Merge branch 'master' into travis-001

.meteor/cordova-plugins

.meteor/packages

.meteor/versions

README.md

client/lib/RoomManager.coffee

client/lib/avatar.coffee

client/lib/chatMessages.coffee

client/lib/collections.coffee

client/lib/cordova/push.coffee

client/lib/fileUpload.coffee

client/lib/notification.coffee

client/lib/recorderjs/audioRecorder.coffee

client/lib/tapi18n.coffee

client/routes/roomRoute.coffee

client/stylesheets/base.less

client/stylesheets/utils/_colors.import.less

client/stylesheets/utils/_octicons.less

client/views/account/accountPreferences.coffee

client/views/account/accountPreferences.html

client/views/account/accountProfile.coffee