Merge branch 'edge'
Merge branch 'edge'
Fix cat editing
Fix cat color changing
Fix capitalization bug in block chart data fetcher
Merge branch 'master' into edge