Initial merge of Graphte Editor code