fixes after merge

Conflicts:
	src/world/droid.cc
	src/world/world.cc
Merge branch 'master' of github.com:sabov/jedi
sphrere size changed