int constants => enum
Merge branch 'master' into library-service
SQLiteBooksDatabase moved to libraryService package
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
fixed proguard package name
fixed package name
Merge branch 'master' into library-service

Conflicts:
	jni/NativeFormats/util/AndroidUtil.cpp