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

Conflicts:
	src/org/geometerplus/android/fbreader/PopupWindow.java
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'beta' into beta-ics
TreeActivity is now a parmatrized type
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into multidirs
Merge branch 'multidirs' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'beta' into beta-ics
parametric base class in NetworkLibraryActivity