Ref #3768 : You can now restore Rules with old file format
Merge pull request #272 from VinceMacBuche/bug_3768/restore_old_fileformat_Rule

Ref #3768 : You can now restore Rules with old file format
Fixes #3764 : Reload technique library button is not broken anymore
Merge pull request #275 from VinceMacBuche/bug_3764/reload_tech_library_button_broken

Fixes #3764 : Reload technique library button is not broken anymore
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5
Merge branch 'branches/rudder/2.5' into branches/rudder/2.6

Conflicts:
	rudder-web/src/main/scala/com/normation/rudder/web/snippet/configuration/TechniqueLibraryManagement.scala
Merge branch 'branches/rudder/2.6'

Conflicts:
	rudder-web/src/main/webapp/secure/administration/policyServerManagement.html