formatting

Conflicts:

	src/org/geometerplus/android/fbreader/network/SQLiteNetworkDatabase.java
	src/org/geometerplus/android/fbreader/preferences/ZLColorPreference.java
	src/org/geometerplus/fbreader/library/Library.java
	src/org/geometerplus/zlibrary/core/html/ZLHtmlParser.java
	src/org/geometerplus/zlibrary/core/xml/ZLXMLReaderAdapter.java
	src/org/geometerplus/zlibrary/text/view/ZLTextWordCursor.java
	src/org/geometerplus/zlibrary/ui/android/application/ZLAndroidApplicationWindow.java
Merge branch 'master' into ice-cream-sandwich