cosmetic changes :sparkles:
solved conflict
Merge branch 'jshint' into mouyan