Merge branch 'development' into bill-scraper-integration
[fixtures] Rename categories.json to tags.json
[fixtures] Change tags json format