Merge branch 'master' into ice-cream-sandwich
CREATE TABLE => CREATE TABLE IF NOT EXISTS
utf8 encoding converter
Merge branch 'master' into ice-cream-sandwich
synchronization with FBReader C++ repository + code cleanup
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into ice-cream-sandwich
code style cleanup
show status bar in menu mode
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	AndroidManifest.xml
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into ice-cream-sandwich
mime types in urilInfo; better opensearch description support
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into ice-cream-sandwich

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