improve handling of empty ScaleHints in WMS capabilities
clarify that max_res is exclusive and min_res inclusive
add min_res/max_res support for tile sources
Merge pull request #35 from olt/tile-source-minmax-res

Add min_res/max_res support for tile sources
improved tile origin handling of WMTS
use in_image exceptions in WMS demo client
update CHANGES.txt with 1.5.x changes
added watermark layer for system tests
added image_opts to TileResponse - watermarked tiles shall now work with the TMS
fixed typo image/jgeg to image/jpeg
fixed typo image/jgeg to image/jpeg and added the watermark_cache layer to all expected_layers lists
increased number of TileSets by 1 in the assertion check (added watermark_cache to layers.yaml)
fixed imports, typos and assertion checks, added a test for watermarked tiles
Merge branch 'master' into watermark_tms_fix
Merge pull request #36 from quiqua/watermark_tms_fix

Fix tile services with watermarks
add forward_req_params to config spec for mapserver sources
pass dimensions to reprojected WMS/mapserver requests
add auth to WMTS service
Merge remote-tracking branch 'mapproxy/master'
add auth to WMTS service