Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/com/amaze/filemanager/adapters/DrawerAdapter.java