*added moving platform
Merge branch 'master' of https://github.com/annsimon/candyland

Conflicts:
	Candyland/Candyland/Candyland.csproj
	Candyland/Candyland/Parsers/ObjectParser.cs
	Candyland/Candyland/SceneStructure/SceneManager.cs