Merge branch 'release/1.0' into develop
added travis file
Merge branch 'release/1.1'