Some small changes for XCode support
Merge branch 'PIC18_master' into PIC18_master_merge

Conflicts:
	ScriptCtrl.h