Update
Merge branch 'master' of https://github.com/w3llschmidt/volkszaehler.org

Conflicts:
	misc/tools/ccalert