Merge branch 'gh-pages' into 2.4
wmts proxy
editImage
WMTS bug
Merge branch '2.4' into gh-pages