queue screen
Merge branch 'master' of https://github.com/dataminerconsulting/queue-based

Conflicts:
	app/Controller/QueueController.php