Change version of pom.xml from 2.4.2-SNAPSHOT to 2.4.2
Fixes 3076: clean EventLog and add ModificationId in event API
Issue #3076: add modificationId in eventLog
Ref #3076 : Add canRollback property
Merging 2.4 into 2.5
Merge pull request #2 from VinceMacBuche/ust_3002/dev/3076_move_eventlog_in_rudder

Fixes #3002 : Change event log to be able to have a rollback system based on them
Refs #3163: change pom version
Merging 2.4 to 2.5
Refs #3166: correct the artefact version on branch master
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'