Fixed font swatches
Removed template name from image directories
Updated files
Corrected color spelling
Merge branch 'master' into develop

Conflicts:
	default.twig
Responsive css from columns and home page