Updated for r3wald composer changes
Merge branch 'travis' of https://github.com/andig/volkszaehler.org into travis