cleaned up most of the csslint errors
Fixed merge conflicts in core.css