fixed font-awesome
merge
merged
fixed conflicts, merged and removed css files from tracking