Added travis-ci
Merge branch 'develop'