Travis CI integration
Merge remote-tracking branch 'github/master' into ecollab.eu