Merged world1 and bonus level changes from trunk