room member join object
making browser window to window image dragging work
removing some unneeded vars
Merge pull request #23 from DigitalZebra/feature

Adding ability to drag an image or image link from one browser window to another
fixing file name
cache emoticon counts, uses native mongo regex query
working on user settings
working sort by popularity
emoticons: search and redid how it works
fixing unread messages; abandoning efforts to migrate user rooms
joining/leaving
removed unnessary check
naming refactor
user doesn't need rooms anymore
reload emote count on emote window open
Merge branch 'master' into roommember

Conflicts:
	assets/app/factory/user.js
	assets/app/header/HeaderController.js
shrunk hr
cleanup
admins
Merge remote-tracking branch 'origin/master'