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

Conflicts:
	app/View/Reports/index.ctp