spit
Merge branch 'master' of http://github.com/makeshiftRADIO/wuddlypin

Conflicts:
	obj/WuddlypinConfig.old
	obj/WuddlypinConfig.xml
	src/entities/characters/player/player_V4.as
	src/worlds/TestStage.as