Merge branch 'master' of https://github.com/pjshree/scratch

Conflicts:
	download-brand.xml
Merge branch 'master' of https://github.com/pjshree/scratch

Conflicts:
	download-brand.xml
Merge remote-tracking branch 'origin/master'