Merge remote branch 'upstream/master'

Conflicts:
	GameServer/alert-config.xml
	GameServer/src/org/moparscape/msc/gs/model/mini/CacheObject.java

...

GameServer/alert-config.xml

@@ -22,5 +22,9 @@
 			<priority>1</priority>
 		</email>
 	</user>
+<<<<<<< HEAD
 </alert>
 
+=======
+</alert>
+>>>>>>> upstream/master

GameServer/src/org/moparscape/msc/gs/Cache.java

@@ -0,0 +1,27 @@
+package org.moparscape.msc.gs;
+
+import java.util.Map;
+
+import org.apache.commons.collections.map.LRUMap;
+
+/**
+ * A basic cache backed by a {@link LRUMap}.
+ * 
+ * @author CodeForFame
+ * 
+ */
+public class Cache<K, V> {
+
+	// Shitty commons and their failure to support generics...
+	@SuppressWarnings("unchecked")
+	private Map<K, V> cache = new LRUMap();
+
+	public V get(K key) {
+		return cache.get(key);
+	}
+
+	public void put(K key, V value) {
+		cache.put(key, value);
+	}
+
+}