Update CHTCollectionViewWaterfallLayout to 0.4
Merge pull request #5167 from chiahsien/master

Update CHTCollectionViewWaterfallLayout to 0.4