Send nick with messages to channels.
Do not highlight the user's own messages/actions.
Merge upstream branch 'development' into tonytrunk

Conflicts:
	client/src/models/application.js
Merge remote-tracking branch 'upstream/development' into tonytrunk
Merge remote-tracking branch 'upstream/development' into tonytrunk
Merge pull request #533 from tonymke/tonytrunk

Do not highlight on own messages