Conflicts:
	xwiki-platform-core/xwiki-platform-lesscss/xwiki-platform-lesscss-default/src/main/java/org/xwiki/lesscss/internal/compiler/CachedIntegratedLESSCompiler.java
	xwiki-platform-tools/xwiki-platform-tool-configuration-resources/src/main/resources/xwiki.properties.vm

* Upgrade to less4j 1.8.5

* moved xalan management to commons since it's a dependency of jdom

* bulletproofing

* fix custom extensions.xwiki.org code included by mistake

* Fix FLAVOR-12 and FLAVOR-13 that also concern xwiki-platform (no issue for that since XWiki 7.0M2 is not released yet).

* add a few more categories
* display and edit category in the extension

* add missing parents

* The ImportMojo should use the default Admin user to install extensions (otherwise we see "Installed by Unknown User").

* Use the diamond operator for Java 7.

* Improve the CSS

Fixed

XWIKI-11272: "Email" word is not capitalized on "Preview" livetable

XWIKI-11858: Upgrade Hibernate and DBCP Connection Provider code to work with DBCP 2.1

* remove duplicate

XCOMMONS-736: Add support for extensions categories

XWIKI-11750: Cannot configure rights for the members of a subwiki until the first member is added to the wiki.

* Add missing annotations.
* Fixing the conflict that occurs during the installation of XWiki on an empty database.