Merge branch 'master' into multidirs

Conflicts:
	src/org/geometerplus/fbreader/library/FileFirstLevelTree.java
Merge branch 'multidirs' into beta

Conflicts:
	AndroidManifest.xml
	AndroidManifest.xml.pattern
	src/org/geometerplus/fbreader/library/FileFirstLevelTree.java
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
merge
merge