added cancan
merge canca local branch and fb stuff