nn
inventory input update
 add inventory Input POPUP
gogo
Merge remote-tracking branch 'origin/master'