Merge branch '38_Task' into prod

Conflicts:
	.gitmodules
Merge branch '12_task' into prod
Merge branch '32_task' into prod

Conflicts:
	sites/all/themes/lumi/styling/css/custom.css
	sites/all/themes/lumi/styling/css/style.css
	sites/all/themes/lumi/templates/page--node-blog-post.tpl.php
Merge branch '31_task' into prod

Conflicts:
	sites/all/modules/features/image_styles_features/image_styles_features.features.inc
	sites/all/modules/features/image_styles_features/image_styles_features.info
	sites/all/themes/lumi/styling/css/custom.css
#61 Change site favicon to new logo: change site favicon image.
Merge branch '61_task' into testing

Conflicts:
	.gitmodules
	sites/all/modules/features/image_styles_features/image_styles_features.features.inc
	sites/all/themes/lumi/styling/css/custom.css