announce status = available

Cordova

minor livechat updates

Conflicts:
	client/startup/defaultRoomTypes.coffee
	packages/rocketchat-lib/lib/roomTypes.coffee
	packages/rocketchat-livechat/client/ui.js
	packages/rocketchat-livechat/permissions.js
	packages/rocketchat-ui-sidenav/side-nav/chatRoomItem.coffee
	packages/rocketchat-ui-sidenav/side-nav/sideNav.coffee

* sunnipaul-chinese-character-support:
  Adapting #1145 for merging
  Update restapi.coffee
  roll back client/views/app/tabBar/membersList.html
  to support Chinese characters slugify function should be disabled
  added api - findOrCreateRoomThenJoin
  add findOrCreateRoom function
  Chinese characters supported including rename room
  Chinese Character supported
  master run
  Enable international characters

Merge branch 'chinese-character-support' of https://github.com/sunnipaul/Rocket.Chat into sunnipaul-chinese-character-support

* 'chinese-character-support' of https://github.com/sunnipaul/Rocket.Chat:
  Update restapi.coffee
  roll back client/views/app/tabBar/membersList.html
  to support Chinese characters slugify function should be disabled
  added api - findOrCreateRoomThenJoin
  add findOrCreateRoom function
  Chinese characters supported including rename room
  Chinese Character supported
  master run
  Enable international characters

# Conflicts:
#	.meteor/packages

remove old add-platform

Fix wrong PGP signature for Sandstorm spk builds

test to see if glitch is fixed

New API for room types

Conflicts:
	packages/rocketchat-lib/package.js

* master:
  Fixed vulnerability issue with file names

There's a bug (feature?) in Sandstorm that prevents spks with an
improper PGP signature from being installed. This change produces an
spk without PGP signatures, and the future `spk repack` command will
allow you to add/change the PGP signatures in addition to changing app id.

[Sandstorm] Show more clear login error for Sandstorm users

minor edit

Yay!

[sandstorm] Add spk generation to travis-ci

Fixes #1328