message highlight when mentioned
Merge pull request #10 from DigitalZebra/master

Message highlight when mentioned
fixing css on message body and the ohdear emoticon
Merge remote-tracking branch 'origin/master'
emoticon list
making emoticons links that append text
auto closing emoticon window; focusing text; much nicer yes
better handling of emoticons
Merge remote-tracking branch 'upstream/master'

Conflicts:
	assets/app/emoticons.js
	assets/app/header/HeaderController.js
	assets/app/header/header.html
	assets/app/room/InputController.js
	assets/app/room/room.html
	assets/styles/bunker.css
More merged files missed in init commit