Adds More Detailed Vending UI etc

Also adds the ability to use multiple medkits and battery packs during
one inventory visit
Merge master fixed conflict
Merge to master