s
Merge branch 'master' of https://github.com/Dino89/Forum
CanCan Rights, Seed update