Adds collection view delegate methods
Merge branch 'develop' into viewcontrollers-setup2