Merge branch 'develop' into char-add

I just want that minor tweak from master here

common/utilities/utility.cpp

@@ -26,7 +26,7 @@
 int snapToBase(int base, int x) {
 	//snap to a grid
 	if (x < 0) {
-		x++;
+		++x;
 		return x / base * base - base;
 	}
 	return x / base * base;

common/utilities/utility.hpp

@@ -32,17 +32,4 @@ std::string to_string_custom(int i);
 
 int to_integer_custom(std::string);
 
-//wow
-template<typename ContainerT, typename PredicateT>
-void erase_if(ContainerT& items, const PredicateT& predicate) {
-	for(auto it = items.begin(); it != items.end(); /* empty */) {
-		if(predicate(*it)) {
-			it = items.erase(it);
-		}
-		else {
-			++it;
-		}
-	}
-};
-
 #endif

server/server_application.cpp

@@ -117,7 +117,7 @@ void ServerApplication::Init(int argc, char** argv) {
 	std::cout << "\tTile Size: " << sizeof(Region::type_t) << std::endl;
 	std::cout << "\tRegion Format: " << REGION_WIDTH << ", " << REGION_HEIGHT << ", " << REGION_DEPTH << std::endl;
 	std::cout << "\tRegion Content Footprint: " << REGION_WIDTH * REGION_HEIGHT * REGION_DEPTH * sizeof(Region::type_t) << std::endl;
-	std::cout << "\tPACKET_BUFFER_SIZE (max size): " << PACKET_BUFFER_SIZE << std::endl;
+	std::cout << "\tPACKET_BUFFER_SIZE: " << PACKET_BUFFER_SIZE << std::endl;
 	std::cout << "\tMAX_PACKET_SIZE: " << MAX_PACKET_SIZE << std::endl;
 
 	//-------------------------