Add collision classes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Run/Field.h