Restructured animated obstacles
Fixed a bug in the collision mechanic
Merge branch 'production' into development