room member join object
fixing unread messages; abandoning efforts to migrate user rooms
joining/leaving
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