update app with cancancan
merge cancancan  with pull