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
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'