edit locations done
Merge branch 'master' of https://github.com/dataminerconsulting/queue-based

Conflicts:
	app/Controller/ChatController.php
chat conflict solved