foundation-clarence
fixed conflicts
fixed map styling