style loc_areas
Merge branch 'sb-04-14'
Add styling merge