Update style.css
Merge branch 'production' into development

Conflicts:
	style.css
Merge branch 'development' into production