Added action queue highlight
Merge branch 'feature'

Conflicts:
	main.js