Yoshiofthewire/CrunchyXBMC — pull request #16 by Reinis (2014-12-15 23:32:09+00:00)
Title: Fix load shelf

- Load shelf only in one place
- Minor cleanups