Merge branch 'hotfix/branch'
Merge branch 'release/v1.1.0'
Setup travis
Merge branch 'hotfix/setup_travis' into develop