Fixes #3511 : Add an icon for modification popup
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Merge branch 'branches/rudder/2.5'
Fixes #3538: Display all cf-promises message in details of deployment error
Fixes #3510 : Remove are you sure message when it is useless
Merge pull request #192 from VinceMacBuche/bug_3511/Add_CR_Icon

Fixes #3511 : Add an icon for modification popup
Merge pull request #193 from fanf/bug_3538/dev/display_cf_promises_msg_in_deployment_error_details

Fixes #3538: Display all cf-promise messages in deployment error's details
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

* branches/rudder/2.4:
  Fixes #3538: Display all cf-promises message in details of deployment error
Merge branch 'branches/rudder/2.5'

* branches/rudder/2.5:
  Fixes #3538: Display all cf-promises message in details of deployment error

Conflicts:
	rudder-web/src/main/scala/com/normation/rudder/web/comet/AsyncDeployment.scala
Fixes #3547 : System groups are now avalable again
Merge pull request #195 from VinceMacBuche/bug_3547/system_groups_were_missing

Fixes #3547 : System groups are now avalable again
Fixes #3548: serial must not count as a conflict for rule CR
Merge pull request #196 from fanf/bug_3548/dev/serial_does_not_count_for_a_rule_change_request_conflit

Fixes #3548: serial must not count as a conflict for rule CR
Merge pull request #194 from VinceMacBuche/bug_3510/remove_are_you_sure

Fixes #3510 : Remove are you sure message when it is useless
Change version of pom.xml to 2.6.0~rc2-SNAPSHOT