Update friendly-id gem, remove redundant code
Merge branch 'master' into dev