collection view refactored
ready to pull
Merge remote-tracking branch 'origin/master'
merge success