Fixed bug in party gird
Merge remote-tracking branch 'origin/inv_mgt' into bootstrap