info panel pointers
Merge remote-tracking branch 'origin/master'

Conflicts:
	common/views/collector_sidebar.htm