added "hoehlenraetsel" prototype
Merge branch 'master' of https://github.com/annsimon/candyland

Conflicts:
	Candyland/CandylandContent/CandylandContent.contentproj
temp switches work
Merge branch 'master' of https://github.com/annsimon/candyland
ObjectPositions set properly (part 1)
minor commit
Merge branch 'master' of https://github.com/annsimon/candyland
Merge branch 'master' of https://github.com/annsimon/candyland

Conflicts:
	Candyland/Candyland/GameObjects/ObstacleMoveable.cs
Merge branch 'master' of https://github.com/annsimon/candyland
all the changes made before the presentation at game jam (temporary switches, candyHelper can collect chocoChips, test level added)
Merge branch 'master' of https://github.com/annsimon/candyland

Conflicts:
	Candyland/Candyland/GameObjects/ChocoChip.cs
	Candyland/Candyland/InputManagerplusSpieler/CandyGuy.cs
	Candyland/Candyland/InputManagerplusSpieler/CandyHelper.cs

refactoring: Event is now SwitchEvent only; use other classes for other events
Merge branch 'master' of https://github.com/annsimon/candyland

Conflicts:
	Candyland/Candyland/InputManagerplusSpieler/CandyHelper.cs