'adjust travis'
Merge branch 'development'