Merge branch 'develop'
Add travis build config
Adds travis build image