half changes for mapping
mapping + Merge branch 'master' of github.com:theZiz/snowman

Conflicts:
	build/pandora/snowman/PXML.xml
	snowman.c