commented and reorganized main.controller
resolved merge conflict
added roomList directive
merge room refactor changes onto master
add button around user glyph in restaurant list