Merge of all CSS files
Merge branch 'ShaneBranch'

Merge CSS File
fix merge error on JS file