Allround template enhancements - attempt nr 2
Tweaks for heading (displaying image/media logo and text logo inline and some other adjustments, option to choose between static template text logo or dynamic site name)
+ replacement of line endings CRLF -> LF