Merge branch 'development' into gnupg

Conflicts:
	templates/auswertung.html.tpl
Zwischenzustand PGP-Verschlüsslung
Merge branch 'smarty3' into gnupg

Conflicts:
	config.inc.php
Funktioniert oberflächlich
Ignoriere Konfigurationsdatei
Merge branch 'development' of github.com:bastiaanzapf/vmb
...
Weitere smarty3 korrekturen
Merge branch 'smarty3' into development

Conflicts:
	templates/auswertung.html.tpl