compiles in xcode
merge master
fix path to inventory panel