embedded fonts processing (in progress)
Merge branch 'beta' into beta-ics
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta
Merge branch 'ice-cream-sandwich' into beta-ics
embedded fonts processing (in progress)
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	jni/NativeFormats/fbreader/src/formats/css/FontMap.cpp
	jni/NativeFormats/fbreader/src/formats/css/FontMap.h
	jni/NativeFormats/fbreader/src/formats/xhtml/XHTMLReader.cpp
Merge branch 'master' into beta

Conflicts:
	jni/NativeFormats/fbreader/src/formats/css/FontMap.cpp
	jni/NativeFormats/fbreader/src/formats/css/FontMap.h
	jni/NativeFormats/fbreader/src/formats/xhtml/XHTMLReader.cpp
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
embedded fonts support (in progress)
Merge branch 'master' into ice-cream-sandwich

Conflicts:
	jni/NativeFormats/fbreader/src/formats/xhtml/XHTMLReader.cpp
Merge branch 'master' into beta

Conflicts:
	jni/NativeFormats/fbreader/src/formats/xhtml/XHTMLReader.cpp
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics
transfer font families data to java code
FontMap does not depend on CSS
Merge branch 'beta' into beta-ics
Merge branch 'master' into ice-cream-sandwich
Merge branch 'ice-cream-sandwich' into beta-ics