Merge branch 'master' of https://github.com/minaevmike/TPDISK
Merge branch 'master' of https://github.com/minaevmike/TPDISK

Conflicts:
	app/src/main/java/com/example/mike/tpdisk/FolderList.java