added extern function name conversation
Merge branch 'formula-editor-christian' into formula-editor

Conflicts:
	src/Catty/FormulaEditor.xib