header.less and inner_page.less
Merge branch 'noel_branch' into weatherblur

Conflicts:
	mod/weatherblur_theme/css/header.less
	mod/weatherblur_theme/css/inner_page.less