Added travis
Merge branch 'master' into develop
Merge branch 'release/TRAVIS_ADDED'