boot.js
Merge branch 'master' of github.com:bootjs/bootjs

Conflicts:
	README-cn.md