Update packages.json
Merge branch 'master' of github.com:nimrod-code/packages

Conflicts:
	packages.json