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 'master' into beta
Merge branch 'beta' into beta-ics

Conflicts:
	src/org/geometerplus/android/fbreader/network/BookDownloaderService.java
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'beta-ics' into betayota
Merge branch 'yota2' into betayota
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 'master' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into betayota

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
Merge branch 'beta-ics' into betayota