Travis integration
Merge branch 'travis_integration' into development