added faq item
renamed koelmel
Merge branch 'master' of https://github.com/knly/HCWK-Web-v2

Conflicts:
	data/faq.php