Merge remote-tracking branch 'origin/master'

Conflicts:
	28-LS-3DMod/03-Scenes/LS_Szene.blend
	39-MS/01-Models/Baum poly.ma
	39-MS/04-Shots/shot1.ma
	39-MS/04-Shots/shot2.ma
	39-MS/04-Shots/shot3.ma
	51-MOE-Animation/01-Models/Affe.ma
	51-MOE-Animation/01-Models/NeuLandschaft.ma
	56-PH-Animation/01-Models/figurlila.blend
	56-PH-Animation/01-Models/figurorange.blend
	56-PH-Animation/01-Models/ph-landscape.blend
	56-PH-Animation/01-Models/ph-pot.blend
	56-PH-Animation/01-Models/ph-tree.blend
	56-PH-Animation/03-Scenes/56-PH-Scene1.blend