jshint-cleanup
Merge commit 'cacf577501fbe3ab6186733cc1c58cc987de1cf7'

Conflicts:
	tool/postscribe/htmlParser/htmlParser.js
Merge commit 'a7884c89ee3c7633ce1270e04a43b09e7c414bfb'