new status + object reorganization
Merge branch 'master' of https://github.com/wormangel/CandyTripSaga

Conflicts:
	Candy Trip Saga.caproj
	Layouts/Level.xml