Add colored markers
Merge branch 'demo' into dev

Conflicts:
	res/layout/list_item.xml