pull upstream master
UICollectionView replaced with PSTCollectionView for iOS 5 compatibility
remove PSTCollectionView as submodule
remove submodule info from readme
improved emoticon loading
Better emoticon display during caching, animation
insert code into text on emoticon selection
Merge latest EmoticonChooser changes