modif requirement, add travis
Merge branch 'dev'