Getting up to date
Merge branch 'master' of https://github.com/AdalbertFochtler/Sim-TV

Conflicts:
	Shooting Star/Assets/Scenes/teleteddies.unity
Merge branch 'master' of https://github.com/AdalbertFochtler/Sim-TV

Conflicts:
	Shooting Star/Assets/Scenes/FinalScene.unity
newsstudio updates
Merge branch 'master' of https://github.com/AdalbertFochtler/Sim-TV

Conflicts:
	Shooting Star/Assets/Levels/Assets/Prefabs/carl.prefab
	Shooting Star/Assets/Levels/Assets/Prefabs/spawnpoint1.prefab
	Shooting Star/Assets/Levels/Assets/Prefabs/waypoint1.prefab
	Shooting Star/Assets/Levels/Assets/Prefabs/waypoint2.prefab
	Shooting Star/Assets/Levels/Assets/Prefabs/waypoint3.prefab
	Shooting Star/Assets/Levels/Assets/Prefabs/waypoint4.prefab
	Shooting Star/Assets/Levels/Assets/Prefabs/waypoint5.prefab
	Shooting Star/Assets/Levels/Assets/Prefabs/waypoint6.prefab
	Shooting Star/Assets/PlayMaker/Resources/PlayMakerGlobals.asset
	Shooting Star/Assets/Scenes/FinalScene.unity
	Shooting Star/Assets/Scenes/newsstudio.unity
	Shooting Star/Assets/Scenes/stage.unity
	Shooting Star/Assets/Scenes/teleteddies.unity
	Shooting Star/Assets/Scenes/test_area.unity
	Shooting Star/ProjectSettings/TagManager.asset