updated requirements.txt
updated travis
Merge branch 'master' into develop
updated version
Merge branch 'release/1.0'