Changed for CanCan Rules
Changed for CanCan Rules
Corrected few of test data
resovled conflict
Resolved conflicts