rebase to dev

rebased the branch to dev so that it will fix any issues
Add vendor inventories to appjs to fix some issues