changed content id (again)
Merge branch 'comp20'