merge
Merge branch 'master' of https://github.com/yezhiming/butterfly

Conflicts:
	js/requirejs-butterfly.js