Dist css folders update
Grunt task update
Merge branch 'develop' into bower-copy

Conflicts:
	assets/files-header.php