Merge remote-tracking branch 'origin/master' into mmaps

Conflicts:
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp

1 files changed, 1 insertions, 1 deletions

diff --git a/src/server/shared/Utilities/Util.h b/src/server/shared/Utilities/Util.h
index 21aaa36498d..f84e5155bb1 100755
--- a/src/server/shared/Utilities/Util.h
+++ b/src/server/shared/Utilities/Util.h
@@ -31,7 +31,7 @@ template<typename T, class S> struct Finder
 {
     T val_;
     T S::* idMember_;
- 
+
     Finder(T val, T S::* idMember) : val_(val), idMember_(idMember) {}
     bool operator()(const std::pair<int, S> &obj) { return obj.second.*idMember_ == val_; }
 };