Content grid progress
fix merge conflict
Merge branch 'master' of https://github.com/team-bubbles/nmcs1