Update gxp, css
Merge branch 'master' into wmplus