Conflicts:
	client/methods/saveRoomName.coffee
	client/views/app/room.html
	i18n/en.i18n.json
	packages/rocketchat-channel-settings/i18n/en.i18n.json
	packages/rocketchat-ui/lib/trackRoomNameChanged.coffee
	server/methods/saveRoomName.coffee

# By matthewmawby (2) and others
# Via Gabriel Engel (2) and others
* 'develop' of github.com:RocketChat/Rocket.Chat:
  fixes blockquote non-continous border - closes #1605
  Removed trash can icon
  tabbed added code
  Added the code to fix issue #1579
  Added in functionality recommended in issue #1412

Added the code to fix issue #1579

Removed trash can icon

Removed the trash icon since the buttons are used to upload files and not delete them

Font mirror icons fix

Resolved the conflict