Make obstacles and players synchronized collections
Merge remote-tracking branch 'origin/master'