remove DIY组件
Merge branch 'master' into gh-pages

Conflicts:
	js/model/Diy.js