added travis file
Merge branch 'travis-ci' into development