Merge branch 'master' into peerlibrary

Conflicts:
	tools/packages.js
	tools/server/server.js
Fixed missed require definition.