Merge branch 'develop_jaken' into develop
Modified .travis.yml android-18