Added option "der pinke blitz"
Merge remote-tracking branch 'origin/master'

Conflicts:
	ext_conf_template.txt
Added option "der pinke blitz"