Minor bug fixes
Update gxp (include ArcGISCacheSource)
Merge branch 'master' into wmplus