Catch-up from Macbook
Merge branch 'master' of https://github.com/scimusmn/Animation-Lab

Conflicts:
	ProgramBlocks.xcodeproj/aheidgerken.mode1v3
	ProgramBlocks.xcodeproj/aheidgerken.pbxuser
	ProgramBlocks.xcodeproj/project.pbxproj
	bin/data/programs/default.xml