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

Conflicts:
	src/org/geometerplus/android/fbreader/PopupWindow.java
TreeActivity is now a parmatrized type
Merge branch 'master' into ice-cream-sandwich
parametric base class in NetworkLibraryActivity
Merge branch 'master' into ice-cream-sandwich
synchronization with library-service branch
Merge branch 'master' into ice-cream-sandwich
merge order
Merge branch 'master' into ice-cream-sandwich
public => protected
Merge branch 'master' into ice-cream-sandwich
synchronization with library-service branch
Merge branch 'master' into ice-cream-sandwich
version number => 1.7
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
imports order