Collection view issues.
Merge branch 'master' into thomas
Stuff
Test
Added comments.
Merge branch 'thomas'