startseite wiki fix
Merge branch 'master' of
ssh://git@github.com/noldmess/Progwebinfosys.git

Conflicts:
	template/article.php