x
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/sb_light.0.1.0.min.js
	bin/sb_light.min.js
	bin/sb_light_commonjs.0.1.0.min.js
	bin/sb_light_commonjs.min.js
.