Merge pull request #419 from VinceMacBuche/bug/4206/english

Refs #4206: Corrected English grammar
Merge pull request #422 from VinceMacBuche/bug_4279/include_techniques

Fixes #4279: Add Techniques in exported zip
Merge branch 'branches/rudder/2.6' into branches/rudder/2.7

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/services/reports/ReportingServiceImpl.scala
Fixes #4374: Add parameters in exported zip