Committing for pull
Merge remote-tracking branch 'origin/master'
Implemented resizing of collection view cells based on content