native code cleanup: synchronization with ics branch
Merge branch 'master' into library-service
formatting cleanup
Merge branch 'master' into library-service

Conflicts:
	src/org/geometerplus/fbreader/library/Library.java
TreeActivity is now a parmatrized type
TreeActivity is now a parmatrized type
merging
Merge branch 'master' into library-service

Conflicts:
	src/org/geometerplus/android/fbreader/library/LibraryActivity.java
parametric base class in NetworkLibraryActivity
Merge branch 'master' into library-service
synchronization with library-service branch
Merge branch 'master' into library-service

Conflicts:
	src/org/geometerplus/fbreader/library/Library.java
merge order
Merge branch 'master' into library-service
public => protected
Merge branch 'master' into library-service

Conflicts:
	src/org/geometerplus/fbreader/book/BooksDatabase.java
synchronization with library-service branch
Merge branch 'master' into library-service

Conflicts:
	src/org/geometerplus/fbreader/library/Library.java
version number => 1.7
Merge branch 'master' into library-service