Worked on scripts and UMS
Merge branch 'master' of https://github.com/nexios/nexios

Conflicts:
	package.json