# Conflicts:
#	public_new/js/views/collaboration/fermi-web-socket-bridge.js

Fixed to use right meeting id

See merge request !224

Fixed for contact and namecard for favorite

See merge request !223

# Conflicts:
#	public_new/js/views/collaboration/collaboration.js
#	public_new/js/views/collaboration/share-event-listener.js
#	public_new/js/views/contact/namecard.js

Fixed to finish collaboration when clean up collaboration message received

See merge request !222

# Conflicts:
#	public_new/js/sockets/chat-websocket-message.js

startPipMode => startPIPMode スペルミス修正

See merge request !221

OS7 で文書協業を始めた時に、Indicatorが消えなくなる不具合を修正した。

See merge request !220

# Conflicts:
#	public_new/js/views/collaboration/collaboration-add-user.js
#	public_new/js/views/collaboration/collaboration.js

Fixed disable the scroll

See merge request !219

Feature/add user in collaboration

See merge request !218

# Conflicts:
#	public_new/js/views/collaboration/collaboration-add-user.js

Feature/archive list order

See merge request !216

Fix/load 100 more messages

See merge request !215

# Conflicts:
#	public_new/js/sockets/chat-websocket-message.js

# Conflicts:
#	public_new/js/sockets/chat-websocket-message.js
#	public_new/js/views/collaboration/collaboration-add-user.js
#	public_new/js/views/collaboration/share-event-listener.js