popup dictionary integration
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'beta' of github.com:geometer/FBReaderJ into beta
unused methods
unused methods
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta-ics' of github.com:geometer/FBReaderJ into beta-ics
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
SQLiteBooksDatabase simplification
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/libraryService/LibraryService.java
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
formatting
Merge branch 'beta' into beta-ics