import renderd-client patch
Merge branch 'master' into renderd-client

Conflicts:
	mapproxy/cache/tile.py
	mapproxy/config/loader.py
update client.renderd for http renderd server
enable locking for renderd tile requests
remove temporary testing files
removed scripts for building openlayers
updated OpenLayers to newest stable release 2.12
updated OpenLayers CSS,
onImageLoadError has now the same bg-color as the other boxes on the page
improve warning for skipped WMTS layers
pass custom restful url_templates to the demo service
fixed missing tile still displaying in chrome
Callback to allow ImageSource to be updated by WSGI middleware

Adds postprocess_image method to the base Server that allows WSGI
middleware to post process the ImageSource prior to it being returned in
the response. Commonly used for applying a graphic watermark or applying
a filter to the image.

The callback is associated with the key mapproxy.postprocess in the WSGI
environment. It is passed the ImageSource and is expected to return an
ImageSource.

The postprocess_image method is called from service/wms and service/tile
prior to the ImageSource being returned in a response.

Added unit tests for postprocess_image method.
reenable logging of renderd requests
better support for mapnik 2

- cache mapnik.Map objects when using inside renderd
- deprecate use_mapnik2 option
Merge pull request #72 from quiqua/demo_with_openlayers_212

Update Demo with OpenLayers 2.12
Ensure that tiles that intersect a coverage are post processed
improve loading of libgdal on Windows

- handle mangled/missing CPLGetLastErrorMsg function
- support loading gdal19/gdal18/gdal17.dll
improve documentation of dependencies on Windows
load pyproj before libproj on windows
Merge branch 'master' of github.com:mapproxy/mapproxy