added travis
Merge branch 'develop' into feature/checkpoint-id