added support for font files in assets
added support for font files in assets
Merge branch 'master' into ice-cream-sandwich
compilation issues
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into yota

Conflicts:
	src/org/geometerplus/zlibrary/ui/android/library/ZLAndroidLibrary.java
added PT Sans font
Merge branch 'ice-cream-sandwich' into yota