Merge pull request #2 from CocoaPods/master

Update
Add CJImageMerge
Merge branch 'master' of https://github.com/batosai/Specs
Merge pull request #1818 from batosai/master

UIImage category for merge two images.