Update openlayers and gxp
Update gxp
Merge remote-tracking branch 'cga/master' into remotelayers
Update openlayers