Merge branch 'master' of https://gitlab.fsi.hochschule-trier.de/GameDevWeek/ws-18_19/unity/suck-it
# Conflicts: # Assets/_Game/Prefabs/Level_Elements/Destroyable_Thing.prefab.meta
# Conflicts: # Assets/_Game/Prefabs/Level_Elements/Destroyable_Thing.prefab.meta