test2
Merge branch 'test1' of https://github.com/Wondermusic/Test into test1

Conflicts:
	SkinInfo.xml