Update .travis.yml
Merge branch 'hotfix/v0.0.1'
Merge branch 'release/0.0.2'
Conflict

Change-Id: Icdceaf5d303a65dcdcb0d706a82eaad4f8e20efa
Fixed travis-ci branch

Change-Id: Ie1125c0cfecb015d2ac31277a91dea4a5c76e58a
Merge branch 'hotfix/travis' into develop