Fixing bug in queue (variable collision error)
Adding temporary token attribute 'phone.1.number'
Merge remote branch 'origin/release' into lightweight_queue

Conflicts:
	api/database/queue.class.php