Update Gemfile.lock
Renamed categories to tags
Merge branch 'dev' into feature/filter-sort