Merge branch 'dev'

CSS changes to support div-based layout for navigation pages in The Loop