#31 - Blog list views [theme]: update image styles feature.
#12 - New home page layout: Added admin page with fields to write all text on home page
#12 - New home page layout: added t() function
#12 - New home page layout[theme]: fix front page styles.
#32 - Blog page improvement: fix styles.
#31 - Blog list views [theme]: fix page title cut.
#12 - New home page layout[theme]: rename variable
Merge branch '32_task' into testing

Conflicts:
	sites/all/themes/lumi/styling/css/custom.css
Merge branch '31_task' into testing

Conflicts:
	sites/all/modules/features/image_styles_features/image_styles_features.features.inc
	sites/all/modules/features/image_styles_features/image_styles_features.info
Merge branch '12_task' into testing

Conflicts:
	sites/all/themes/lumi/templates/page--node-blog-post.tpl.php