Switched to Doctrine 2.4 to satisfy composer
Merge branch 'travis' of https://github.com/andig/volkszaehler.org into travis