Obstacle collisions
Merge remote-tracking branch 'origin/Andy's-testing' into Andy's-testing

Conflicts:
	helicopter.kv