removed duplicate files
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	res/layout-large-land/main.xml
	res/layout-xlarge-land/main.xml
Merge branch 'ice-cream-sandwich' into microtypography
renaming: fbreader_bw => fbreader_logo
color logos for v14
synchronisation with hamburger branch
Merge branch 'ice-cream-sandwich' into microtypography
synchronisation with hamburger branch
Merge branch 'ice-cream-sandwich' into microtypography
sync with hamburger branch
code simplification
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into microtypography
missing file
Merge branch 'ice-cream-sandwich' into microtypography
VERSION => 2.2 beta 7
Merge branch 'master' into ice-cream-sandwich

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