Merge branch 'hotfix/testdata'
Added travis build status
Merge branch 'master' into develop