package 이동
Merge branch 'master' of https://github.com/jungrammer/FileManager

Conflicts:
	app/src/main/java/jungrammer/filemanager/FileListAdapter.java
Context action bar