Merge pull request #22 from tribal-tec/master

Update generated files
Fix tests on travis

Change-Id: I2e071a980df8af445755166e41592fb32614af3f
Merge branch 'master' of github.com:BlueBrain/DisplayCluster