revert dummy modules
Merge remote-tracking branch 'origin/master'

Conflicts:
	app.js
	routes/manage_queues.js