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

Conflicts:
	src/org/geometerplus/fbreader/book/BooksDatabase.java