Refs #3175: add the tooling to order trees
Merge pull request #3 from ncharles/bug_3175/dev/display_tree_in_category_select

Refs #3175: add the tooling to order trees
Fixes #3207: correct the sorting of files in zip
Merge pull request #4 from fanf/bug_3207/dev/correct_sorting_of_file_in_zip

Fixes #3207: correct the sorting of files in zip
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

* branches/rudder/2.4:
  Fixes #3207: correct the sorting of files in zip
Merge branch 'branches/rudder/2.5'

* branches/rudder/2.5:
  Fixes #3207: correct the sorting of files in zip
Merge branch 'branches/rudder/2.3' into branches/rudder/2.4

Conflicts:
	utils/src/main/scala/com/normation/utils/Utils.scala
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Merge branch 'branches/rudder/2.5'
Update the POMs to prepare the Rudder 2.5.0 RC1 release
Merge branch 'branches/rudder/2.5'

* branches/rudder/2.5:
  Update the POMs to prepare the Rudder 2.5.0 RC1 release
Change version of pom.xml from 2.5.0-SNAPSHOT to 2.5.0
Change version of pom.xml from 2.5.0 to 2.5.1-SNAPSHOT
Updated the POM versions to 2.4.4
Revert "Updated the POM versions to 2.4.4"

This reverts commit a578cff37758e8124b332804d536ffefde5e87b0.
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Merge branch 'branches/rudder/2.5'

Conflicts:
	authorization-api/pom.xml
	eventlog-api/pom.xml
	historization-api/pom.xml
	pom.xml
	spring-run-dependencies/pom.xml
	utils/pom.xml
Updated the version to 2.4.4-SNAPSHOT to let the development continue peacefully
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

* branches/rudder/2.4:
  Updated the version to 2.4.4-SNAPSHOT to let the development continue peacefully

Conflicts:
	authorization-api/pom.xml
	eventlog-api/pom.xml
	historization-api/pom.xml
	pom.xml
	spring-run-dependencies/pom.xml
	utils/pom.xml
Merge branch 'branches/rudder/2.5'

* branches/rudder/2.5:
  Updated the version to 2.4.4-SNAPSHOT to let the development continue peacefully