working on getting outside menu click to close menu. has a bug
Revert "working on getting outside menu click to close menu. has a bug"

This reverts commit 26ebe01026f9c9eb611324861f52c1886aa50341.
fixing bug with mentions of users with similar names; cleaning up styling of caret on mentions
fixing indentation, missed WebStorm setting
making the mention regex a little more liberal
fixing 404 for emoticons on page load; fixing disappearing rooms on header bar
refactoring; adjusting styling on alert messages borders
angular 1.3 [crosses fingers]
merging from upstream
fixing mention use cases per pull request comments. Regex matches all punctuation now.
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