Initial commit
Merge branch 'travis' of https://github.com/andig/volkszaehler.org into travis

Conflicts:
	.travis.yml