Merge pull request #12 from DigitalZebra/master

Fixing and cleaning up a few things with mentions
fixing bug where disconnects could sometimes cause repeater angular error
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/app/room/room.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	assets/app/room/room.html
emoticons
refactoring current room resolve
Removing duplicate directive that made it's way there from one of my prior merges
emoticons
viewport scaling, hopefully makes mobile viewing less shitty
Adding in the thumbs emoticons
Merge pull request #13 from djbielejeski/master

Adding in the thumbs emoticons
bold and italics (but not bold italics, p.s. I hate the first person to point this out)
Merge remote-tracking branch 'origin/master'
Updating the member list to be ordered by peoples nicknames.  Updating the author name to not be broken on long names.
Merge pull request #14 from djbielejeski/master

Updating the member list Fix for author name css
redis [crosses fingers]
not using \w for italics lookup since it matches _
Merge remote-tracking branch 'origin/master'
undoing redis
trying redis again