Merge branch 'master' into frontend
added 2 missing lines to banner theming
Merge branch 'frontend'