Added travis-ci
Fixed wrong travis filename
Fixed wrong travis filename
Embedded travis ci badge
Merge branch 'develop'