Refactor Text, Shape, Icon and FAChar

Refactor Graph (allow graph in graph)

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>