Merge branch 'develop'
updated podspec
updated project settings
updated travis.yml
Merge branch 'master' into develop