Meteorit, kollison, movement etc

Meteorit, kollison, movement etc
Merge branch 'Christoph'