Merge pull request #223 from fanf/ust_3613/dev/3622_add_non_regex_matches

Fixes #3622: Add a comparator for not matching a regex
Fixes #3713 : Remove old SQL scripts (2.3 to 2.4 upgrades)
Merge pull request #251 from fanf/bug_3686/dev/allows_parameter_in_middle_of_text

Fixes #3689: Allows to have a parameter in the middle of some text
Merge pull request #248 from VinceMacBuche/ust_3711/implem_3713/Remove_sql_scripts

Fixes #3711 : Remove old SQL scripts (2.3 to 2.4 upgrades)
Merge branch 'branches/rudder/2.4' into branches/rudder/2.5

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/services/policies/ParameterizedValueLookupService.scala
Merge branch 'branches/rudder/2.5' into branches/rudder/2.6

Conflicts:
	rudder-core/src/test/scala/com/normation/rudder/domain/policies/RuleValTest.scala
Merge branch 'branches/rudder/2.6'

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala
	rudder-core/src/test/scala/com/normation/rudder/domain/policies/RuleValTest.scala
Merge branch 'master' of github.com:Normation/rudder
Merge pull request #250 from fanf/ust_3711/dev/3715_remove_scala_for_migration_10_2

Fixes #3715 refs #3711: remove Scala logic for migration from XML File format 1.0
V1
Rule API V2!
V1 Directive
V1:Groups
V1:Nodes
Add parameters from directives
Refactoring, Reason, change Request parameters
Add JSON to Directive and Group, display crId if needed
Make things compile on master plus some little corrections
Put all the API related code in c.n.r.web.rest.directive