++cocoascript
fix libffi
Merge remote-tracking branch 'origin/master'

Conflicts:
	External/CocoaScript