match_parent => fill_parent (for compatibility)
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into ics-catalogs
unused methods
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into ics-catalogs
RSSNetworkLink is predefined link, not custom one
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into ics-catalogs
formatting
formatting
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into ics-catalogs

Conflicts:
	src/org/geometerplus/fbreader/network/NetworkLibrary.java
cleanup
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into ics-catalogs