Merge branch 'master-A'

xwiki-platform-colibri/pom.xml

xwiki-platform-colibri/src/assemble/skin.xml

...i-platform-colibri/src/main/resources/colibri/colibri.css

...latform-colibri/src/main/resources/colibri/contentmenu.vm

...orm-colibri/src/main/resources/colibri/docdoesnotexist.vm

...i-platform-colibri/src/main/resources/colibri/docextra.vm

xwiki-platform-colibri/src/main/resources/colibri/edit.vm

...platform-colibri/src/main/resources/colibri/editinline.vm

...i-platform-colibri/src/main/resources/colibri/editmenu.vm

...i-platform-colibri/src/main/resources/colibri/editmeta.vm

...-platform-colibri/src/main/resources/colibri/editmodes.vm

...form-colibri/src/main/resources/colibri/editpanelsvars.vm

xwiki-platform-colibri/src/main/resources/colibri/global.vm

xwiki-platform-colibri/src/main/resources/colibri/header.vm

xwiki-platform-colibri/src/main/resources/colibri/ie-6.css

xwiki-platform-colibri/src/main/resources/colibri/ie-all.css

xwiki-platform-colibri/src/main/resources/colibri/logo.png

...i-platform-colibri/src/main/resources/colibri/menuedit.vm

...i-platform-colibri/src/main/resources/colibri/menuview.vm

...-platform-colibri/src/main/resources/colibri/noavatar.png