JavaScript-Standards more conflicts added.
Conflicts with JavaScript removed.
Merge branch 'master' of https://github.com/gorv/Coding-Standards