fixed bug: atel queue now shows the number of objects in the list (was stuck at 0)
Merge remote-tracking branch 'origin/bug'

Conflicts:
	pessto_marshall_engine/webapp/marshall/sidebar/__init__.py