Move banner into theme
Merge branch 'master' into navigation