Merge branch 'master' of https://github.com/EpochModTeam/DayZ-Epoch

SQF/dayz_code/medical/setup_functions_med.sqf

@@ -296,6 +296,8 @@ fnc_usec_damageBleed = {
 	private["_wound","_modelPos","_point","_source"];
 	_unit = _this select 0;
 	_wound = _this select 1;
+	_point = objNull;
+	_source = objNull;
 	//_injury = _this select 2; // not used. damage% ???
 
 	if (isServer) exitWith{}; // no graphical effects on server!

SQF/dayz_code/system/scheduler/sched_towngenerator.sqf

@@ -162,7 +162,7 @@ sched_townGenerator = {
 								_position = _x select 2;
 								_blocked = false;
 								{
-									if (_position distance _x < 150 && {_x select 1 != "waterHoleProxy"}) exitWith {
+									if (_position distance _x < 150) exitWith {
 										_blocked = true;
 									};
 								} forEach dayz_townGeneratorBlackList;