introduced FontEntry & FontMap classes
new resource string
Merge branch 'master' into ice-cream-sandwich
Merge branch 'master' into beta

Conflicts:
	assets/resources/application/de.xml
fixed option name in Preferences
Merge branch 'beta' into beta-ics
Merge branch 'ice-cream-sandwich' into beta-ics