Changed from the meetup.
Merge branch 'master' of https://github.com/cobusbernard/restack into cobusbernard-master

Conflicts:
	lib/system/middleware/router.js
resolved