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

Conflicts:
	src/org/geometerplus/android/fbreader/PopupWindow.java
Merge branch 'master' into library-service

Conflicts:
	src/org/geometerplus/fbreader/library/Library.java
Merge branch 'ice-cream-sandwich' into library-service-ics

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

Conflicts:
	src/org/geometerplus/android/fbreader/library/LibraryActivity.java
Merge branch 'ice-cream-sandwich' into library-service-ics

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