int constants => enum
Merge branch 'master' into multidirs
SQLiteBooksDatabase moved to libraryService package
Merge branch 'master' into multidirs

Conflicts:
	src/org/geometerplus/android/fbreader/preferences/EditBookInfoActivity.java
fixed proguard package name
fixed package name
Merge branch 'master' into multidirs