updated font detector
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle
missing book: toast => notification
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/android/fbreader/FBReader.java
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle
fbreader icon for notifications
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
Merge branch 'yota2' into kindle
2.1.4
Merge branch 'yota2' into kindle

Conflicts:
	AndroidManifest.xml
2.1.4

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

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