added listview
Merge remote-tracking branch 'flush-origin/feature/listview' into develop

Conflicts:
	app/src/main/res/layout/fragment_list.xml