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

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
	src/org/geometerplus/android/fbreader/libraryService/LibraryService.java
	src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java
Merge branch 'library-service' into library-service-ics
Merge branch 'ice-cream-sandwich' into library-service-ics
fixed proguard package name
fixed package name
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into library-service

Conflicts:
	jni/NativeFormats/util/AndroidUtil.cpp
Merge branch 'ice-cream-sandwich' into library-service-ics

Conflicts:
	jni/NativeFormats/util/AndroidUtil.cpp
Merge branch 'library-service' into library-service-ics