Merge branch 'travis-fix' into develop
Added sonatype information
Merge branch 'develop'