update collectionViewDataSource to Xcode6-b7 optional syntax