Change version of pom.xml to 2.6.2-SNAPSHOT
Fixes #3617 : correct the sql query to display last seen for a node
Merge pull request #218 from ncharles/bug_3617/dev/correct_query_used_in_node_display

Fixes #3617 : correct the sql query to display last seen for a node so that it uses an indexed field
Fixes #3621 : when deleting a group, remove it from the rule as well
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
Merge pull request #221 from ncharles/bug_3621/dev/delete_dependancies_when_removing_group

Fixes #3621 : when deleting a group, remove it from the rule as well
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.5' into branches/rudder/2.6

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/services/servers/NewNodeManager.scala
	rudder-web/src/main/scala/bootstrap/liftweb/AppConfig.scala
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Merge branch 'branches/rudder/2.5' into branches/rudder/2.6

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/services/servers/NewNodeManager.scala
	rudder-web/src/main/scala/bootstrap/liftweb/AppConfig.scala
	rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala
Merge branch 'branches/rudder/2.6' of github.com:Normation/rudder into branches/rudder/2.6

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/services/servers/NewNodeManager.scala
	rudder-web/src/main/scala/bootstrap/liftweb/AppConfig.scala
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