ZLAndroidLibrary.isYotaPhone & isKindleFire methods
ZLAndroidLibrary.isYotaPhone & isKindleFire methods

Conflicts:
	src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java