Fixes #3191 : No change on Rule/Group/Directive cause no deployment
Merge pull request #92 from VinceMacBuche/bug_3191/no_change_no_deployment

Fixes #3191 : No change on Rule/Group/Directive cause no deployment
Fixes #3175: correct the category arborescence in group creation/modification
Merge pull request #104 from fanf/bug_3175/dev/make_arborescent_category_display

Fixes #3175: correct the category arborescence in group creation/modification
Ref #3175 : fix typo in function call
Merge branch 'branches/rudder/2.3' into branches/rudder/2.4

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/repository/NodeGroupCategoryRepository.scala
	rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPNodeGroupCategoryRepository.scala
	rudder-web/src/main/scala/com/normation/rudder/web/components/ConfigurationRuleEditForm.scala
	rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala
	rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala
	rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupForm.scala
	rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCategoryOrGroupPopup.scala
Fix after merge
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/repository/NodeGroupCategoryRepository.scala
	rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPNodeGroupCategoryRepository.scala
	rudder-web/src/main/scala/com/normation/rudder/web/components/DirectiveEditForm.scala
	rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupCategoryForm.scala
	rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupForm.scala
	rudder-web/src/main/scala/com/normation/rudder/web/components/RuleEditForm.scala
	rudder-web/src/main/scala/com/normation/rudder/web/components/popup/CreateCategoryOrGroupPopup.scala
Merge branch 'branches/rudder/2.5'