Build: Lint errors fixed and csslint removed
merging