Merge pull request #31 from Nurhashimah/master

Fix menu item - return key
Critical Updates-1.2.1 & 2 Fixed Asset & Inventory