Merge remote-tracking branch 'orgin/master' into omaster

Conflicts:
	src/itdelatrisu/opsu/GameImage.java
	src/itdelatrisu/opsu/OsuGroupNode.java

src/org/newdawn/slick/Music.java

@@ -44,6 +44,7 @@ import org.newdawn.slick.util.Log;
  * @author kevin
  * @author Nathan Sweet <misc@n4te.com>
  */
+@SuppressWarnings({"rawtypes", "unchecked"})
 public class Music {
 	/** The music currently being played or null if none */
 	private static Music currentMusic;

src/org/newdawn/slick/openal/SoundStore.java

@@ -52,6 +52,7 @@ import org.newdawn.slick.util.ResourceLoader;
  * @author Kevin Glass
  * @author Rockstar setVolume cleanup 
  */
+@SuppressWarnings({"rawtypes", "unchecked", "unused"})
 public class SoundStore {
 	
 	/** The single instance of this class */
@@ -318,7 +319,8 @@ public class SoundStore {
 		inited = true;
 		
 		AccessController.doPrivileged(new PrivilegedAction() {
-            public Object run() {
+			@Override
+			public Object run() {
 				try {
 					AL.create();
 					soundWorks = true;