added chocoChip System, made the world larger
Merge branch 'master' of https://github.com/annsimon/candyland

Conflicts:
	Candyland/Candyland/Parsers/ObjectParser.cs
	Candyland/CandylandContent/CandylandContent.contentproj
	Candyland/CandylandContent/SceneTest.xml
some additional changes to scene, moveable object can be moved now, replaced model of ChocoChip

BUG: moveable only has collision detection while player didn't stand on "door" to area; "door" to level is fine though...