Merge branch 'hotfix/travis'
Merge branch 'develop'
travis correction
Merge branch 'hotfix/Test' into develop