Merge branch 'master' into portals

Conflicts:
	src/Chunk.cpp
	src/Entities/Entity.h
	src/Entities/Player.h

src/Protocol/ProtocolRecognizer.cpp

@@ -37,6 +37,7 @@ cProtocolRecognizer::cProtocolRecognizer(cClientHandle * a_Client) :
 cProtocolRecognizer::~cProtocolRecognizer()
 {
 	delete m_Protocol;
+	m_Protocol = NULL;
 }