2014-04-28, 19:17
Master branch isn't used only Frodo and Gotham branches so no merging should be needed. This may sound like a silly question but do your albums show and play from the GUI? When you say the buttons, do you mean "Play", "Enqueue", etc. for the albums?
If you press F12 in your browser do you see any errors in the console?
If you press F12 in your browser do you see any errors in the console?