Updates to reflect FTGL changes.
Merge branch 'master' into ftglBranch

Conflicts:
	mainVmap/inputs/test.epp