NetworkImage logic simplified
cookie db initialisation
NetworkImage logic simplified
cookie db initialisation

Conflicts:
	src/org/geometerplus/android/fbreader/network/BookDownloaderService.java
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into microtypography
separate instance for Notifier
synchronisation with master branch
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
Merge branch 'ice-cream-sandwich' into microtypography
cover icon in missing book notification
Merge branch 'ice-cream-sandwich' into microtypography
code simplification + unique notification per download url
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into microtypography
better download book notification
updated ChangeLog
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
Merge branch 'ice-cream-sandwich' into microtypography
delayed notification