added icon for school, university, churches, public buildings, added suburbs and hamlets, fixed layer order for adminpoly so names are not obscured