Merge branch 'master' into test1

Conflicts:
	SkinInfo.xml
test
.
.
Merge branch 'master' into test1

Conflicts:
	SkinInfo.xml