Fixes for inventory select + inventory display

Displays are almost done
Merge branch 'master' of https://github.com/leonwlaw/TeamRubiconFTW