list_item_filter.xml: Added basic layout
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/res/layout/list_item_filter.xml
Merge remote-tracking branch 'origin/master'