Styling UserIndex PlayList and fixing Time Issue
Merge pull request #51 from tidydee/layout/playList_in_user_index

Styling UserIndex PlayList and fixing Time Issue
fixing rooms list on popup
Merge pull request #52 from tidydee/fixing/rooms_list

fixing rooms list on popup
fixing player bug
Merge pull request #53 from tidydee/debug/player_in_users

fixing player bug
Merge branch 'master' into show-page-change

Conflicts:
	app/views/shared/_footer.html