Update travis
Merge branch 'master' of https://github.com/juanjo23/sqa2014tennis