Basic Cancan functionality complete
Merge remote-tracking branch 'multitenant/master'