update npm
Merge branch 'master' of https://github.com/coolrahul1850/Maps

Conflicts:
	public/externals/JS/Onload.js