Fixes #3597 : add tooltip on static and dynamic in group modification
Merge pull request #215 from ncharles/bug_3597/dev/add_tooltip_on_static_and_dynamic

Fixes #3597 : add tooltip on static and dynamic in group modification
Merge branch 'branches/rudder/2.3' into branches/rudder/2.4

Conflicts:
	rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupForm.scala
Missing a part of the previous merge
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

Conflicts:
	rudder-web/src/main/scala/com/normation/rudder/web/components/NodeGroupForm.scala
fixes fixes #3601 workflow notification now goes above logo in low res
Merge pull request #222 from aesraethr/bug_3601/dev/workflows_notifications

fixes fixes #3601 top-right notification now goes above logo in low res
Fixes #3625: accept node with same IP if not in authorized networks
Merge pull request #224 from fanf/bug_3625/allow_to_accept_with_same_ip_if_not_in_authNetworks

Fixes #3625: accept node with same IP if not in authorized networks
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/services/servers/NewNodeManager.scala
Fixes #3512: erase error in search node form when needed
Merge pull request #225 from fanf/bug_3512/error_not_erased_in_search_nodes_form

Fixes #3512: erase error in search node form when needed
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Fixes #3373 - Fix typo: 'unknow' instead of 'unknown'
Merge pull request #226 from nperron/bug_3373/dev/fix_typo_about_unknow_instead_of_unknown

Fixes #3373 - Fix typo: 'unknow' instead of 'unknown'
Merge branch 'branches/rudder/2.3' into branches/rudder/2.4

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPNodeConfigurationMapper.scala
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Change version of pom.xml to 2.4.7-SNAPSHOT
Change version of pom.xml to 2.5.5-SNAPSHOT
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5