Merge branch 'templates' into 'testing'

footer/ header adapted

See merge request !42
1 job for testing in 1 second (queued for 1 second)