int constants => enum
Merge branch 'master' into ice-cream-sandwich
Merge branch 'beta' into beta-ics
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
SQLiteBooksDatabase moved to libraryService package
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into multidirs

Conflicts:
	src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java
Merge branch 'multidirs' into beta

Conflicts:
	src/org/geometerplus/android/fbreader/library/BookInfoActivity.java
	src/org/geometerplus/android/fbreader/library/LibraryActivity.java
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
fixed proguard package name
fixed package name
Merge branch 'master' into multidirs
Merge branch 'master' into ice-cream-sandwich
Merge branch 'multidirs' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics