notification icon + api level
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle
fixed opds plugin connection
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle
renamed 'local OPDS scanner' => 'Calibre integration'
VERSION => 2.1.7
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle

Conflicts:
	AndroidManifest.xml