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
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