Merge branch 'dev'
initial travis.ci config