breaking platform, bonbon, salesman, ...
Merge branch 'master' of github.com:annsimon/candyland

Conflicts:
	Candyland/Candyland/InputManagerplusSpieler/CandyGuy.cs
	Candyland/CandylandContent/CandylandContent.contentproj