edit devise & cancan for students
merge