Changed gameplay manager, tweaks to obstacles
Merge branch 'production' into development