Merge pull request #82 from khempenius/fixFloatingTab

Re-factored layout / Fixed tabs and dots
Merge pull request #83 from khempenius/fixFloatingTab

Fixed merge error re: message count
"Meh" face instead of confusion symbol
Username is now the username in the user object
Merge pull request #84 from thompsona/edits

"Meh" face for confusion and correct username displayed in messages
Removed help tooltips
Added single help dialog box
Added more helpful help dialog to help dialog box
Merge pull request #86 from thompsona/edits

Changed help tooltips to single help dialog box
Merge branch 'master' into fixFloatingTab

Conflicts:
	frontend/js/player_main.coffee
	static/js/player_main.js