Change version of pom.xml to 2.4.5-SNAPSHOT
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

Conflicts:
	pom.xml
	rudder-core/pom.xml
	rudder-web/pom.xml
Change version of pom.xml to 2.5.2-SNAPSHOT
Fixes #3411: display error notification in rule edit form
Merge pull request #156 from fanf/bug_3411/error_notification_are_not_displayed_in_rule_edit_form

Fixes #3411: display error notification in rule edit form
Fixes #3420: allows to remove node
Merge pull request #160 from fanf/bug_3420/remove_node_leads_to_deployment_error

Fixes #3420: allows to remove node
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Fixes #3462: make system item be modifiable by system calls
Merge pull request #164 from fanf/bug_3462/make_system_directive_updatable_by_migration_script

Fixes #3462: make system item be modifiable by system calls
Fixes #3468: show only distinct rules depending of a directive
Merge pull request #168 from fanf/bug_3468/multiple_rule_in_dependency_popup_when_disabling_directive

Fixes #3468: show only distinct rules depending of a directive
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

Conflicts:
	rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala
	rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupForm.scala
Change version of pom.xml to 2.5.3-SNAPSHOT
Fixes #3392: filename of zip archive now contains the date time of archive
Merge pull request #174 from fanf/bug_3392/dev/change_zip_archive_name

Fixes #3392: filename of zip archive now contains the date time of archive
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

* branches/rudder/2.4:
  Fixes #3392: filename of zip archive now contains the date time of archive
Fixes #3471: add a notice message when a report archiving is running
Merge pull request #190 from fanf/bug_3471/display_warn_archiving_process_in_progress

Fixes #3471: add a notice message when a report archiving is running