unused import
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta

Conflicts:
	src/org/geometerplus/fbreader/library/Library.java
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
unused method
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta

Conflicts:
	src/org/geometerplus/fbreader/fbreader/FBReaderApp.java
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
naming/access rights cleanup
Merge branch 'master' into ice-cream-sandwich
Merge branch 'multidirs' into beta
Merge branch 'master' into multidirs
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
access rights + some bookmark-related methods moved to BookCollection
Merge branch 'master' into beta

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