introduced FontEntry & FontMap classes
new resource string
Merge branch 'master' into beta

Conflicts:
	assets/resources/application/de.xml
fixed option name in Preferences