Enable code coverage reporting
Fix travis script
Merge branch 'develop'