Merge branch 'hotfix/stablebuild'
Added travis
Merge branch 'hotfix/update' into develop