Fixed collision property jumping

Should we make collisions and keep upright properties the way gravity
property is done?
Merge pull request #138 from robotboy655/patch3

Fixed collision property jumping