synchronization with beta branch
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/BookmarksActivity.java