Add JSCS linter
Updates
Resolved conflict from merge