add jshint testing
Fix merge conflict
Fix Merge conflict
Add restful to mocha test automation