Updated JSLint
Updated JSLint and JS Files List for JSLinting.
JSLinted JavaScript files.
Resolve merge conflicts