Updating the demo project view controllers to conform to the beta 7 updated for UICollectionViewDataSource functions