consolidating CSS into scss files
Merge commit 'jc.heroslider.r04' into integration