Upgrade of GXP
Merge pull request #884 from camptocamp/gxp-upgrade

Upgrade of GXP