Merge branch 'master' into develop
set up for measuring code coverage
updated travis.yml
updated podspec
Merge branch 'develop'