bookshelf plugin link disabled
reset hash received from the server
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle
VERSION => 2.1.9
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
updated ChangeLog
Merge branch 'master' into ice-cream-sandwich
Merge branch 'yota2' into kindle
Merge branch 'ice-cream-sandwich' into yota2
2.1.8.1
2.1.8.1

Conflicts:
	AndroidManifest.xml
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
updated some German strings
Merge pull request #254 from MaDill/master

updated some German strings