Fixes #3286: system items can not be modified like non-system ones
Fixes #3348: missing header for ModificationService
fixes #3328 links correctly displayed in event logs
Merge pull request #145 from aesraethr/bug_3328/dev/links_in_eventlogs

fixes #3328 links correctly displayed in event logs
Merge pull request #140 from fanf/bug_3286/dev/system_item_should_not_be_modifiable_by_public_api

Fixes #3286: system items can not be modified like non-system ones
Merge pull request #142 from fanf/bug_3348/missing_header_for_ModificationService

Fixes #3348: missing header for ModificationService
Merge pull request #135 from ncharles/bug3333/dev/add_deployment_failure_reason_in_log

Fixes #3333: add the reason for deployment failure in the app logs
Merging 2.3 into 2.4
Merging 2.4 into 2.5
Merge branch 'branches/rudder/2.5'

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/repository/DirectiveRepository.scala
	rudder-core/src/main/scala/com/normation/rudder/repository/RuleRepository.scala
	rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPDirectiveRepository.scala
	rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPNodeGroupRepository.scala
	rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPRuleRepository.scala
	rudder-core/src/main/scala/com/normation/rudder/services/queries/DynGroupUpdaterService.scala
	rudder-core/src/main/scala/com/normation/rudder/services/servers/NewNodeManager.scala
	rudder-core/src/main/scala/com/normation/rudder/services/servers/PolicyServerManagementService.scala
plop
Merge remote-tracking branch 'vme_origin/proto/workflows' into proto/workflows
Remove unwanted println introduced during 2.6.0 refactoring
Change initialState to be the old Directive, not the one with the modification
Remove rootsection from add diff and delete Diff, use technique current rootSection instead
Add javascript function to make diff in rudder.js
Add modification diff V1
merge
Remove unused service
Merge branch 'master' into proto/workflows