troep
Merge branch 'list_to_listview' of https://github.com/MoveLife/Project4 into list_to_listview

Conflicts:
	.gradle/1.10/taskArtifacts/cache.properties.lock
	.gradle/1.10/taskArtifacts/fileHashes.bin
	.gradle/1.10/taskArtifacts/fileSnapshots.bin
	.gradle/1.10/taskArtifacts/taskArtifacts.bin