Merge branch 'dev'
add gitter web hook for travis