Ignore ghost effect in touching primitives
Merge branch 'touching-ignore-ghost'

Conflicts:
	phosphorus.js