from pc
Merge branch 'master' of https://github.com/mrsegev/Beautiful_Drawer

Conflicts:
	.gradle/1.10/taskArtifacts/cache.properties.lock
	.gradle/1.10/taskArtifacts/fileHashes.bin
	.gradle/1.10/taskArtifacts/fileSnapshots.bin
	.gradle/1.10/taskArtifacts/outputFileStates.bin
	.gradle/1.10/taskArtifacts/taskArtifacts.bin
	dragSortListView/build/bundles/release/classes.jar
	dragSortListView/build/libs/dragSortListView.aar