bug fix & use cancancan & new event view in calendar