Collection View Cells with FlowLayout
Merge branch 'development' into features-categoryViewController