add enabled and disabled class to the calendar days
merge branches to solve spec conflicts