Merge branch 'hotfix/travis'
Add gitter badge
Merge branch 'hotfix/gitter' into develop