fix description disappeared on chooser-view
remove conflict command
restruct
remove scaffold
Merge branch 'master' of https://github.com/yezhiming/atom-butterfly
Merge branch 'master' of https://github.com/yezhiming/atom-butterfly
add hook
Merge branch 'master' of https://github.com/yezhiming/atom-butterfly

Conflicts:
	lib/build/ios-build-view.coffee
rename
rename
using native reduce method
Merge branch 'master' of https://github.com/yezhiming/atom-butterfly

Conflicts:
	lib/build/build-manager.coffee
	lib/build/build-state-view.coffee