mapproxy
Merge branch 'master' of https://github.com/robystar/GisClient-3.3