Fixes #3305: remove a 404 on jstree/.../style.css when on technique details
Fixes #3308: display the content of metadata.xml and template.cf for Technique
Merge pull request #132 from VinceMacBuche/ust_3309/dev_3310/Solaris_Support

Fixes #3309 : Add Solaris Support in Rudder
Merge pull request #128 from fanf/bug_3305/dev/style_css_not_found_on_technique_details

Fixes #3305: remove a 404 on jstree/.../style.css when on technique details
Merge pull request #129 from fanf/ust_3306/dev/3308_display_metadata_and_template_content_of_technique

Fixes #3308: display the content of metadata.xml and template.cf for Technique
Revert "Merge pull request #129 from fanf/ust_3306/dev/3308_display_metadata_and_template_content_of_technique"

This reverts commit 8a1ba5e1033bb86e485272d6dd009ff076742701, reversing
changes made to 3b071faa47d03ff8cfb8ce2ace191f69ccea4e31.
Revert "Fixes #3305: remove a 404 on jstree/.../style.css when on technique details"

This reverts commit 02084173fe3eed1276830e5f75b5978765e0e206 because there is no string interpolation in Scala 2.9
Fixes #3305: remove a 404 on jstree/.../style.css when on technique details
Merge branch 'branches/rudder/2.5'

* branches/rudder/2.5:
  Fixes #3305: remove a 404 on jstree/.../style.css when on technique details
  Revert "Fixes #3305: remove a 404 on jstree/.../style.css when on technique details"
  Fixes #3310 : Add Solaris SUpport in Rudder
  Fixes #3305: remove a 404 on jstree/.../style.css when on technique details

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/domain/queries/CmdbQuery.scala
	rudder-web/src/main/scala/com/normation/rudder/web/components/TechniqueTree.scala
Merge pull request #125 from VinceMacBuche/bug_3298/Start_automatic_report_logger

Fixes #3298 : Automatic report logger is starting again
Ref #3297 : Add new columns to search node result (os details/ last report)
Fixes #3297 Add machine Column