merge code
Merge branch 'develop' of github.com:yuliang29/kibo into develop
tune to pass jshint