Updated files with Underscore and SM ID
Merges old Style css with new style css
Re-arranges Vendor Files
removes inherit folder with extra space at the end
resolves conflicts