more "special" options
more "special" options
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota2
options order
Merge branch 'yota2' into kindle

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