ASCollectionView
Improve performance
Merge branch 'origin/master'