Made some changes, then changed them back, probably some work on the item panel
Merge branch 'master' of http://github.com/scwe/YoloRiot