Merge pull request #108 from jackykschou/sprint10Merge

Sprint10 merge
updated InputManager and survival area prefabs
Merge branch 'develop' into sprint10Merge