Merge branch 'master' into develop
convert to XCTest
updated travis.yml
updated podspec
Merge branch 'develop'