add travis-setting
Merge branch 'develop'