Add CocoaPods podspec
Merge remote-tracking branch 'upstream/master'
Combine HIDPI Images added to OSX target