native code cleanup: synchronization with ics branch
Merge branch 'master' into multidirs
formatting cleanup
Merge branch 'master' into multidirs
TreeActivity is now a parmatrized type
Merge branch 'master' into multidirs
parametric base class in NetworkLibraryActivity
Merge branch 'master' into multidirs
synchronization with library-service branch
Merge branch 'master' into multidirs
merge order
Merge branch 'master' into multidirs
public => protected
Merge branch 'master' into multidirs

Conflicts:
	src/org/geometerplus/fbreader/book/BooksDatabase.java
synchronization with library-service branch
Merge branch 'master' into multidirs
version number => 1.7
Merge branch 'master' into multidirs
imports order
Merge branch 'master' into multidirs