Fixes #5923: System rule are modified when trying to delete a directive
Merge pull request #709 from fanf/bug_5923/system_rule_are_modified_when_trying_to_delete_a_directive

Fixes #5923: System rule are modified when trying to delete a directive
Fixes #5347: Create system variable CONFIGURATION_REPOSITORY_FOLDER to define the configuration repository location
Fixes #5958: Add asynchronous and refresh to change request table
Fixes #5644: We can't search for "Name =" for an environment variable name in node
Fixes #5950: Auto-adjust the height of the technique editor
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11
Merge pull request #708 from fanf/bug_5950/auto_adjust_the_height_of_the_technique_editor

Fixes #5950: Auto-adjust the height of the technique editor
Merge pull request #713 from fanf/bug_5644/we_can_t_search_for_is_defined_for_an_environment_variable_name_in_node

Fixes #5644: We can't search for "Name =" for an environment variable na...
Merge branch 'branches/rudder/2.11' into branches/rudder/3.0
Fixes #5961: Generating policies failed with "key not found: LICENSESPAID"
Merge pull request #710 from ncharles/bug_5347/dev/define_sys_var_for_repo

Fixes #5347: Create system variable CONFIGURATION_REPOSITORY_FOLDER to d...
Merge pull request #714 from fanf/bug_5961/generating_policies_failed_with_key_not_found_licensespaid

Fixes #5961: Generating policies failed with "key not found: LICENSESPAID"
Merge pull request #711 from VinceMacBuche/dev_5958/add_asynchronous_data_to_change_request_table

Fixes #5958: Add asynchronous and refresh to change request table
Merge branch 'branches/rudder/2.10' into branches/rudder/2.11

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala
	rudder-web/src/main/scala/bootstrap/liftweb/AppConfig.scala
Merge branch 'branches/rudder/2.11' into branches/rudder/3.0

Conflicts:
	rudder-core/src/main/scala/com/normation/rudder/services/policies/SystemVariableService.scala
Merge branch 'branches/rudder/3.0'