All git flow branches added to travis-ci file
Merge branch 'hotfix/invalid_travis_ci_file' into develop