Merge remote-tracking branch 'remotes/origin/master' into web_interface

Conflicts:
	CMakeLists.txt
	common/logtypes.h
	common/shareddb.cpp
	world/net.cpp
	zone/client_logs.cpp
	zone/corpse.cpp
	zone/mob.cpp
	zone/net.cpp

dependencies/luabind/luabind/object.hpp

@@ -537,6 +537,7 @@ namespace detail
   };
 
 // Needed because of some strange ADL issues.
+#if BOOST_VERSION < 105700
 
 #define LUABIND_OPERATOR_ADL_WKND(op) \
   inline bool operator op( \
@@ -557,7 +558,8 @@ namespace detail
   LUABIND_OPERATOR_ADL_WKND(!=)
 
 #undef LUABIND_OPERATOR_ADL_WKND
- 
+#endif
+
 } // namespace detail
 
 namespace adl