Merge remote-tracking branch 'org/master' into ReplayTest

Conflicts:
	src/itdelatrisu/opsu/objects/HitObject.java
	src/itdelatrisu/opsu/states/Game.java

src/itdelatrisu/opsu/objects/Circle.java

@@ -178,4 +178,10 @@ public class Circle implements HitObject {
 
 		return false;
 	}
-}
+
+	@Override
+	public float[] getPointAt(int trackPosition) { return new float[] { x, y }; }
+
+	@Override
+	public int getEndTime() { return hitObject.getTime(); }
+}