Reverts 09ae07dca, thus fixing #244.
use modern objc syntax
Merge remote-tracking branch 'upstream/master'

Conflicts:
	PSTCollectionView/PSTCollectionView.m