Change some files
Merge branch 'master' of https://github.com/fengyuanchen/distpicker

Conflicts:
	package.json