Fixes #4643: Don't gray out search button on node search
Fixes #5926: Rudder readme is totally out of date and irrelevant
Merge pull request #693 from fanf/bug_5926/rudder_readme_is_totally_out_of_date_and_irrelevant

Fixes #5926: Rudder readme is totally out of date and irrelevant
Fixes #5648: Don't include Rudder server component in results by default
Fixes #5786: You cannot pass 'include' /  'exclude' targets as json for Rule API
Merge pull request #695 from fanf/bug_5786/you_cannot_pass_include_exclude_targets_as_json_for_rule_api

Fixes #5786: You cannot pass 'include' /  'exclude' targets as json for ...
Fixes #5933: Don't NPE on node display
Issue #5786: typo in method name
Merge pull request #696 from ncharles/bug_5933/dev/npe_on_pending_inventory

Fixes #5933: Don't NPE on node display
Fixes #5887: You can now select correctly a directive kind in directive
page
Fixes #5123: group category cannot be read from json parameters
Merge pull request #692 from ncharles/bug_4643/dev/search_button_grayed

Fixes #4643: Don't gray out search button on node search
Merge pull request #697 from VinceMacBuche/bug_5887/directive_stays_selected_in_directives_tree_even_after_other_item_has_been_selected_and_displayed

Fixes #5887: You can now select correctly a directive kind in directive page
Merge pull request #698 from fanf/bug_5123/group_category_cannot_be_read_from_json_parameters

Fixes #5123: group category cannot be read from json parameters
Merge pull request #694 from ncharles/bug_5648/dev/exclude_server_with_roles

Fixes #5648: Don't include Rudder server component in results by default
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Merge branch 'branches/rudder/2.11' into branches/rudder/3.0

Conflicts:
	rudder-web/src/main/scala/com/normation/rudder/web/rest/RestExtractorService.scala
Merge branch 'branches/rudder/3.0'