comment template
Merge remote-tracking branch 'origin/master'

Conflicts:
	public/Client.html
comment submit template und merge