Merge branch 'master' into develop
apply Xcode suggestion
version++
updated travis.yml
Merge branch 'develop'