Github issue #6: moved fonts to separate folder
Merge branch 'gi6' into 7.x-1.x