formatting

Conflicts:

	src/org/geometerplus/android/fbreader/FBReader.java
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
formatting

Conflicts:

	src/org/geometerplus/fbreader/network/opds/OPDSLinkXMLReader.java
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
formatting

Conflicts:

	src/org/geometerplus/zlibrary/core/image/ZLFileImage.java
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics