Merge remote branch 'origin/master'

diff --cc balanceLeeStricklin.cfg
index 2ccca9fccc09f994f41df2669ccc6e44bcbfb898,c1ff936126ba31177bac603eb64366dd10bc250f..8a0ae6c46224929acbb9574496eb204d40f22db6
--- 1/balanceLeeStricklin.cfg
--- 2/balanceLeeStricklin.cfg
+++ b/balanceLeeStricklin.cfg
@@@ -279,11 -279,10 +279,10 @@@ set g_balance_uzi_speed 1800
  set g_balance_uzi_bulletconstant 300 // 13.1qu
  // }}}
  // {{{ mortar
- set g_balance_grenadelauncher_primary2secondary 0
- set g_balance_grenadelauncher_primary_sticky 0
+ set g_balance_grenadelauncher_primary_type 0
  set g_balance_grenadelauncher_primary_damage 65
  set g_balance_grenadelauncher_primary_edgedamage 35
 -set g_balance_grenadelauncher_primary_force 400
 +set g_balance_grenadelauncher_primary_force 310
  set g_balance_grenadelauncher_primary_radius 140
  set g_balance_grenadelauncher_primary_speed 2000
  set g_balance_grenadelauncher_primary_speed_up 200
@@@ -295,10 -294,15 +294,15 @@@ set g_balance_grenadelauncher_primary_r
  set g_balance_grenadelauncher_primary_animtime 0.3
  set g_balance_grenadelauncher_primary_ammo 2
  set g_balance_grenadelauncher_primary_health 72
- set g_balance_grenadelauncher_secondary_sticky 0
+ set g_balance_grenadelauncher_primary_damageforcescale 0
+ set g_balance_grenadelauncher_primary_bouncefactor 0.7
+ set g_balance_grenadelauncher_primary_bouncestop 0.12
+ set g_balance_grenadelauncher_primary_remote_minbouncecnt 0
+ 
+ set g_balance_grenadelauncher_secondary_type 1
  set g_balance_grenadelauncher_secondary_damage 65
  set g_balance_grenadelauncher_secondary_edgedamage 35
 -set g_balance_grenadelauncher_secondary_force 400
 +set g_balance_grenadelauncher_secondary_force 320
  set g_balance_grenadelauncher_secondary_radius 140
  set g_balance_grenadelauncher_secondary_speed 1400
  set g_balance_grenadelauncher_secondary_speed_up 200