Merge branch 'master' of /git/contactform

Conflicts:
	doc/www/bte/index.bte
	src/contact.pl
	src/contactform.xml
Back out commit of conflict