moved dependencies to the correct place in package.json
Merge branch 'master' into jsapp-improvements