fixes #3119 directive fieldsets removed
fixes #3325 styles adjustment on directive screen
fixes #3119 directive fieldsets removed
fixes #3320 help now displayed in tooltips
Merge pull request #133 from aesraethr/ust_2950/dev_3119/change_directive_fieldsets

Fixes #3119 - Directive fieldsets removed
Merge pull request #134 from aesraethr/ust_2950/dev_3320/directive_help_tooltip

Fixes #3320 - Directive help tooltip
Merge branch 'ust_2950/dev_3325/directive_styles' of github.com:aesraethr/rudder into aesraethr-ust_2950/dev_3325/directive_styles

Conflicts:
	rudder-web/src/main/webapp/javascript/rudder/rudder.js
Merge pull request #131 from VinceMacBuche/ust_3296/implem_3297/Add_columns_search_result_machine_type

Fixes #3297 : Add new columns to search node result (os details/ last report)
Merge branch 'ust_3303/implem_3304/accepted_node_pag_with_newcolumnse' of github.com:VinceMacBuche/rudder into VinceMacBuche-ust_3303/implem_3304/accepted_node_pag_with_newcolumnse

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/domain/eventlog/AssetsEventLog.scala
	rudder-core/src/main/scala/com/normation/rudder/domain/nodes/NodeInfo.scala
	rudder-core/src/main/scala/com/normation/rudder/repository/jdbc/ReportsJdbcRepository.scala
	rudder-core/src/main/scala/com/normation/rudder/repository/ldap/LDAPEntityMapper.scala
	rudder-core/src/main/scala/com/normation/rudder/services/eventlog/EventLogDetailsService.scala
	rudder-core/src/main/scala/com/normation/rudder/services/servers/RemoveNodeService.scala
	rudder-web/src/main/scala/bootstrap/liftweb/AppConfig.scala
	rudder-web/src/main/scala/com/normation/rudder/web/components/SearchNodeComponent.scala
	rudder-web/src/main/scala/com/normation/rudder/web/services/EventListDisplayer.scala
	rudder-web/src/main/scala/com/normation/rudder/web/services/SrvGrid.scala
Refs #3303 - Fix merge error in NodeInfo.scala
Refs #3303 - Fix merge error in NodeInfo.scala
Revert "Refs #3303 - Fix merge error in NodeInfo.scala"

This reverts commit 7b73758b711abaf913d03d119d913a6e7ae3180f.
Revert "Refs #3303 - Fix merge error in NodeInfo.scala"

This reverts commit 5f7c65b0b1ad67c72d42c8fb99675e651aaac450.
Revert "Merge branch 'ust_3303/implem_3304/accepted_node_pag_with_newcolumnse' of github.com:VinceMacBuche/rudder into VinceMacBuche-ust_3303/implem_3304/accepted_node_pag_with_newcolumnse"

This reverts commit ca326491ba02b7a9ba031856a527f99f62667fd8, reversing
changes made to d9adfa0c5a02eb9a8bea663150983a2d4d3f3e2d.
Fixes #3296 : Handle empty machine Inventory
Ref #3304 : Add "Nodes" page