new mechanism: player and companion both have their own starting position in each level
Merge branch 'master' of https://github.com/annsimon/candyland
switch mechanic works, some changes to SceneEditor, player and companion are reset to a specified position
Merge branch 'master' of https://github.com/annsimon/candyland
switch-events are parsed from xml now
added .suo to ignore
Merge branch 'master' of https://github.com/annsimon/candyland

Conflicts:
	Candyland/Candyland/SceneStructure/SceneManager.cs
	Candyland/CandylandContent/CandylandContent.contentproj
	SceneEditor/SceneEditor/Scene.cs
added second switch for switchGroup test