New way of updating collection views
Fixed bugs in applying changes to the collection view.
Merge remote-tracking branch 'origin/master'