Fixes for Playtest Build
Merge branch 'Development' of https://github.com/GHoning/DeLawei into Development