Angelcode font support

Merge of angelcode branch into master