fixed jshint issues
Merge with designerRefactoring branch.