Added functionality to queue, and amended url in controller
Merge branch 'cookie' into development