Merge branch 'develop'

src/default_line.sld

src/default_point.sld

src/default_polygon.sld

src/mapfile.py

src/maptools.py

src/server.py