fixed merge code typo in js and added some missing semicolomns for style purposes
Merge pull request #837 from Zentyal/jag/core-typo-js

fixed merge code typo in js and added some missing semicolomns for style...