Merged.
Merge branch 'master' of https://www.github.com/Radirius/MERCury

Conflicts:
	MERCury/target/MERCury-1.0.0-experimental-sources.jar
	MERCury/target/MERCury-1.0.0-experimental.jar
	MERCury/target/site/apidocs/allclasses-frame.html
	MERCury/target/site/apidocs/allclasses-noframe.html
	MERCury/target/site/apidocs/constant-values.html
	MERCury/target/site/apidocs/deprecated-list.html
	MERCury/target/site/apidocs/help-doc.html
	MERCury/target/site/apidocs/index-all.html
	MERCury/target/site/apidocs/index.html
	MERCury/target/site/apidocs/overview-frame.html
	MERCury/target/site/apidocs/overview-summary.html
	MERCury/target/site/apidocs/overview-tree.html
	MERCury/target/site/apidocs/radirius/merc/audio/Audio.html
	MERCury/target/site/apidocs/radirius/merc/audio/OggData.html
	MERCury/target/site/apidocs/radirius/merc/audio/OggDecoder.html
	MERCury/target/site/apidocs/radirius/merc/audio/OggInputStream.html
	MERCury/target/site/apidocs/radirius/merc/audio/WaveData.html
	MERCury/target/site/apidocs/radirius/merc/audio/class-use/Audio.html
	MERCury/target/site/apidocs/radirius/merc/audio/class-use/OggData.html
	MERCury/target/site/apidocs/radirius/merc/audio/class-use/OggDecoder.html
	MERCury/target/site/apidocs/radirius/merc/audio/class-use/OggInputStream.html
	MERCury/target/site/apidocs/radirius/merc/audio/class-use/WaveData.html
	MERCury/target/site/apidocs/radirius/merc/audio/package-frame.html
	MERCury/target/site/apidocs/radirius/merc/audio/package-summary.html
	MERCury/target/site/apidocs/radirius/merc/audio/package-tree.html
	MERCury/target/site/apidocs/radirius/merc/audio/package-use.html
	MERCury/target/site/apidocs/radirius/merc/command/Command.html
	MERCury/target/site/apidocs/radirius/merc/command/CommandList.html
	MERCury/target/site/apidocs/radirius/merc/command/CommandThread.html
	MERCury/target/site/apidocs/radirius/merc/command/Variable.html
	MERCury/target/site/apidocs/radirius/merc/command/class-use/Command.html
	MERCury/target/site/apidocs/radirius/merc/command/class-use/CommandList.html
	MERCury/target/site/apidocs/radirius/merc/command/class-use/CommandThread.html
	MERCury/target/site/apidocs/radirius/merc/command/class-use/Variable.html
	MERCury/target/site/apidocs/radirius/merc/command/package-frame.html
	MERCury/target/site/apidocs/radirius/merc/command/package-summary.html
	MERCury/target/site/apidocs/radirius/merc/command/package-tree.html
	MERCury/target/site/apidocs/radirius/merc/command/package-use.html
	MERCury/target/site/apidocs/radirius/merc/data/Data.html
	MERCury/target/site/apidocs/radirius/merc/data/MercData.html
	MERCury/target/site/apidocs/radirius/merc/data/class-use/Data.html
	MERCury/target/site/apidocs/radirius/merc/data/class-use/MercData.html
	MERCury/target/site/apidocs/radirius/merc/data/package-frame.html
	MERCury/target/site/apidocs/radirius/merc/data/package-summary.html
	MERCury/target/site/apidocs/radirius/merc/data/package-tree.html
	MERCury/target/site/apidocs/radirius/merc/data/package-use.html
	MERCury/target/site/apidocs/radirius/merc/environment/Entity.html
	MERCury/target/site/apidocs/radirius/merc/environment/Renderable.html
	MERCury/target/site/apidocs/radirius/merc/environment/Updatable.html
	MERCury/target/site/apidocs/radirius/merc/environment/class-use/Entity.html
	MERCury/target/site/apidocs/radirius/merc/environment/class-use/Renderable.html
	MERCury/target/site/apidocs/radirius/merc/environment/class-use/Updatable.html
	MERCury/target/site/apidocs/radirius/merc/environment/package-frame.html
	MERCury/target/site/apidocs/radirius/merc/environment/package-summary.html
	MERCury/target/site/apidocs/radirius/merc/environment/package-tree.html
	MERCury/target/site/apidocs/radirius/merc/environment/package-use.html
	MERCury/target/site/apidocs/radirius/merc/exceptions/MERCuryException.html
	MERCury/target/site/apidocs/radirius/merc/exceptions/class-use/MERCuryException.html
	MERCury/target/site/apidocs/radirius/merc/exceptions/package-frame.html
	MERCury/target/site/apidocs/radirius/merc/exceptions/package-summary.html
	MERCury/target/site/apidocs/radirius/merc/exceptions/package-tree.html
	MERCury/target/site/apidocs/radirius/merc/exceptions/package-use.html
	MERCury/target/site/apidocs/radirius/merc/font/Font.html
	MERCury/target/site/apidocs/radirius/merc/font/TrueTypeFont.IntObject.html
	MERCury/target/site/apidocs/radirius/merc/font/TrueTypeFont.html
	MERCury/target/site/apidocs/radirius/merc/font/class-use/Font.html
	MERCury/target/site/apidocs/radirius/merc/font/class-use/TrueTypeFont.IntObject.html
	MERCury/target/site/apidocs/radirius/merc/font/class-use/TrueTypeFont.html
	MERCury/target/site/apidocs/radirius/merc/font/package-frame.html
	MERCury/target/site/apidocs/radirius/merc/font/package-summary.html
	MERCury/target/site/apidocs/radirius/merc/font/package-tree.html
	MERCury/target/site/apidocs/radirius/merc/font/package-use.html
	MERCury/target/site/apidocs/radirius/merc/framework/Core.html
	MERCury/target/site/apidocs/radirius/merc/framework/Plugin.html
	MERCury/target/site/apidocs/radirius/merc/framework/Runner.html
	MERCury/target/site/apidocs/radirius/merc/framework/class-use/Core.html
	MERCury/target/site/apidocs/radirius/merc/framework/class-use/Plugin.html
	MERCury/target/site/apidocs/radirius/merc/framework/class-use/Runner.html
	MERCury/target/site/apidocs/radirius/merc/framework/package-frame.html
	MERCury/target/site/apidocs/radirius/merc/framework/package-summary.html
	MERCury/target/site/apidocs/radirius/merc/framework/package-tree.html
	MERCury/target/site/apidocs/radirius/merc/framework/package-use.html
	MERCury/target/site/apidocs/radirius/merc/geometry/Circle.html
	MERCury/target/site/apidocs/radirius/merc/geometry/Ellipse.html
	MERCury/target/site/apidocs/radirius/merc/geometry/Line.html
	MERCury/target/site/apidocs/radirius/merc/geometry/Point.html
	MERCury/target/site/apidocs/radirius/merc/geometry/Polygon.html
	MERCury/target/site/apidocs/radirius/merc/geometry/Rectangle.html
	MERCury/target/site/apidocs/radirius/merc/geometry/Shape.html
	MERCury/target/site/apidocs/radirius/merc/geometry/Star.html
	MERCury/target/site/apidocs/radirius/merc/geometry/Triangle.html
	MERCury/target/site/apidocs/radirius/merc/geometry/Vec.html
	MERCury/target/site/apidocs/radirius/merc/geometry/Vec2.html
	MERCury/target/site/apidocs/radirius/merc/geometry/Vec3.html
	MERCury/target/site/apidocs/radirius/merc/geometry/class-use/Circle.html
	MERCury/target/site/apidocs/radirius/merc/geometry/class-use/Ellipse.html
	MERCury/target/site/apidocs/radirius/merc/geometry/class-use/Line.html
	MERCury/target/site/apidocs/radirius/merc/geometry/class-use/Point.html
	MERCury/target/site/apidocs/radirius/merc/geometry/class-use/Polygon.html
	MERCury/target/site/apidocs/radirius/merc/geometry/class-use/Rectangle.html
	MERCury/target/site/apidocs/radirius/merc/geometry/class-use/Shape.html
	MERCury/target/site/apidocs/radirius/merc/geometry/class-use/Star.html
	MERCury/target/site/apidocs/radirius/merc/geometry/class-use/Triangle.html
	MERCury/target/site/apidocs/radirius/merc/geometry/class-use/Vec.html
	MERCury/target/site/apidocs/radirius/merc/geometry/class-use/Vec2.html
	MERCury/target/site/apidocs/radirius/merc/geometry/class-use/Vec3.html
	MERCury/target/site/apidocs/radirius/merc/geometry/package-frame.html
	MERCury/target/site/apidocs/radirius/merc/geometry/package-summary.html
	MERCury/target/site/apidocs/radirius/merc/geometry/package-tree.html
	MERCury/target/site/apidocs/radirius/merc/geometry/package-use.html
	MERCury/target/site/apidocs/radirius/merc/graphics/Animation.html
	MERCury/target/site/apidocs/radirius/merc/graphics/Batcher.html
	MERCury/target/site/apidocs/radirius/merc/graphics/Camera.html
	MERCury/target/site/apidocs/radirius/merc/graphics/Color.html
	MERCury/target/site/apidocs/radirius/merc/graphics/FrameBuffer.html
	MERCury/target/site/apidocs/radirius/merc/graphics/Graphics.html
	MERCury/target/site/apidocs/radirius/merc/graphics/Shader.html
	MERCury/target/site/apidocs/radirius/merc/graphics/SpriteSheet.html
	MERCury/target/site/apidocs/radirius/merc/graphics/SubTexture.html
	MERCury/target/site/apidocs/radirius/merc/graphics/Texture.html
	MERCury/target/site/apidocs/radirius/merc/graphics/Textured.html
	MERCury/target/site/apidocs/radirius/merc/graphics/VAOBatcher.VertexData.html
	MERCury/target/site/apidocs/radirius/merc/graphics/VAOBatcher.html
	MERCury/target/site/apidocs/radirius/merc/graphics/VAOGraphics.html
	MERCury/target/site/apidocs/radirius/merc/graphics/VAOUtils.html
	MERCury/target/site/apidocs/radirius/merc/graphics/class-use/Animation.html
	MERCury/target/site/apidocs/radirius/merc/graphics/class-use/Batcher.html
	MERCury/target/site/apidocs/radirius/merc/graphics/class-use/Camera.html
	MERCury/target/site/apidocs/radirius/merc/graphics/class-use/Color.html
	MERCury/target/site/apidocs/radirius/merc/graphics/class-use/FrameBuffer.html
	MERCury/target/site/apidocs/radirius/merc/graphics/class-use/Graphics.html
	MERCury/target/site/apidocs/radirius/merc/graphics/class-use/Shader.html
	MERCury/target/site/apidocs/radirius/merc/graphics/class-use/SpriteSheet.html
	MERCury/target/site/apidocs/radirius/merc/graphics/class-use/SubTexture.html
	MERCury/target/site/apidocs/radirius/merc/graphics/class-use/Texture.html
	MERCury/target/site/apidocs/radirius/merc/graphics/class-use/Textured.html
	MERCury/target/site/apidocs/radirius/merc/graphics/class-use/VAOBatcher.VertexData.html
	MERCury/target/site/apidocs/radirius/merc/graphics/class-use/VAOBatcher.html
	MERCury/target/site/apidocs/radirius/merc/graphics/class-use/VAOGraphics.html
	MERCury/target/site/apidocs/radirius/merc/graphics/class-use/VAOUtils.html
	MERCury/target/site/apidocs/radirius/merc/graphics/package-frame.html
	MERCury/target/site/apidocs/radirius/merc/graphics/package-summary.html
	MERCury/target/site/apidocs/radirius/merc/graphics/package-tree.html
	MERCury/target/site/apidocs/radirius/merc/graphics/package-use.html
	MERCury/target/site/apidocs/radirius/merc/gui/Button.html
	MERCury/target/site/apidocs/radirius/merc/gui/CheckBox.html
	MERCury/target/site/apidocs/radirius/merc/gui/Component.html
	MERCury/target/site/apidocs/radirius/merc/gui/Container.html
	MERCury/target/site/apidocs/radirius/merc/gui/ImageButton.html
	MERCury/target/site/apidocs/radirius/merc/gui/NewLine.html
	MERCury/target/site/apidocs/radirius/merc/gui/Panel.html
	MERCury/target/site/apidocs/radirius/merc/gui/RadioCheckBox.html
	MERCury/target/site/apidocs/radirius/merc/gui/TextBar.html
	MERCury/target/site/apidocs/radirius/merc/gui/TextBox.html
	MERCury/target/site/apidocs/radirius/merc/gui/TextButton.html
	MERCury/target/site/apidocs/radirius/merc/gui/TextField.html
	MERCury/target/site/apidocs/radirius/merc/gui/Window.html
	MERCury/target/site/apidocs/radirius/merc/gui/class-use/Button.html
	MERCury/target/site/apidocs/radirius/merc/gui/class-use/CheckBox.html
	MERCury/target/site/apidocs/radirius/merc/gui/class-use/Component.html
	MERCury/target/site/apidocs/radirius/merc/gui/class-use/Container.html
	MERCury/target/site/apidocs/radirius/merc/gui/class-use/ImageButton.html
	MERCury/target/site/apidocs/radirius/merc/gui/class-use/NewLine.html
	MERCury/target/site/apidocs/radirius/merc/gui/class-use/Panel.html
	MERCury/target/site/apidocs/radirius/merc/gui/class-use/RadioCheckBox.html
	MERCury/target/site/apidocs/radirius/merc/gui/class-use/TextBar.html
	MERCury/target/site/apidocs/radirius/merc/gui/class-use/TextBox.html
	MERCury/target/site/apidocs/radirius/merc/gui/class-use/TextButton.html
	MERCury/target/site/apidocs/radirius/merc/gui/class-use/TextField.html
	MERCury/target/site/apidocs/radirius/merc/gui/class-use/Window.html
	MERCury/target/site/apidocs/radirius/merc/gui/package-frame.html
	MERCury/target/site/apidocs/radirius/merc/gui/package-summary.html
	MERCury/target/site/apidocs/radirius/merc/gui/package-tree.html
	MERCury/target/site/apidocs/radirius/merc/gui/package-use.html
	MERCury/target/site/apidocs/radirius/merc/input/Input.html
	MERCury/target/site/apidocs/radirius/merc/input/class-use/Input.html
	MERCury/target/site/apidocs/radirius/merc/input/package-frame.html
	MERCury/target/site/apidocs/radirius/merc/input/package-summary.html
	MERCury/target/site/apidocs/radirius/merc/input/package-tree.html
	MERCury/target/site/apidocs/radirius/merc/input/package-use.html
	MERCury/target/site/apidocs/radirius/merc/logging/Logger.Case.html
	MERCury/target/site/apidocs/radirius/merc/logging/Logger.html
	MERCury/target/site/apidocs/radirius/merc/logging/class-use/Logger.Case.html
	MERCury/target/site/apidocs/radirius/merc/logging/class-use/Logger.html
	MERCury/target/site/apidocs/radirius/merc/logging/package-frame.html
	MERCury/target/site/apidocs/radirius/merc/logging/package-summary.html
	MERCury/target/site/apidocs/radirius/merc/logging/package-tree.html
	MERCury/target/site/apidocs/radirius/merc/logging/package-use.html
	MERCury/target/site/apidocs/radirius/merc/maths/MercMath.html
	MERCury/target/site/apidocs/radirius/merc/maths/class-use/MercMath.html
	MERCury/target/site/apidocs/radirius/merc/maths/package-frame.html
	MERCury/target/site/apidocs/radirius/merc/maths/package-summary.html
	MERCury/target/site/apidocs/radirius/merc/maths/package-tree.html
	MERCury/target/site/apidocs/radirius/merc/maths/package-use.html
	MERCury/target/site/apidocs/radirius/merc/particles/Particle.html
	MERCury/target/site/apidocs/radirius/merc/particles/ParticleEmitter.ParticleSetup.html
	MERCury/target/site/apidocs/radirius/merc/particles/ParticleEmitter.html
	MERCury/target/site/apidocs/radirius/merc/particles/class-use/Particle.html
	MERCury/target/site/apidocs/radirius/merc/particles/class-use/ParticleEmitter.ParticleSetup.html
	MERCury/target/site/apidocs/radirius/merc/particles/class-use/ParticleEmitter.html
	MERCury/target/site/apidocs/radirius/merc/particles/package-frame.html
	MERCury/target/site/apidocs/radirius/merc/particles/package-summary.html
	MERCury/target/site/apidocs/radirius/merc/particles/package-tree.html
	MERCury/target/site/apidocs/radirius/merc/particles/package-use.html
	MERCury/target/site/apidocs/radirius/merc/resource/Loader.html
	MERCury/target/site/apidocs/radirius/merc/resource/Resource.html
	MERCury/target/site/apidocs/radirius/merc/resource/class-use/Loader.html
	MERCury/target/site/apidocs/radirius/merc/resource/class-use/Resource.html
	MERCury/target/site/apidocs/radirius/merc/resource/package-frame.html
	MERCury/target/site/apidocs/radirius/merc/resource/package-summary.html
	MERCury/target/site/apidocs/radirius/merc/resource/package-tree.html
	MERCury/target/site/apidocs/radirius/merc/resource/package-use.html
	MERCury/target/site/apidocs/radirius/merc/splash/SplashScreen.html
	MERCury/target/site/apidocs/radirius/merc/splash/class-use/SplashScreen.html
	MERCury/target/site/apidocs/radirius/merc/splash/package-frame.html
	MERCury/target/site/apidocs/radirius/merc/splash/package-summary.html
	MERCury/target/site/apidocs/radirius/merc/splash/package-tree.html
	MERCury/target/site/apidocs/radirius/merc/splash/package-use.html
	MERCury/target/site/apidocs/radirius/merc/tests/AudioTest.html
	MERCury/target/site/apidocs/radirius/merc/tests/CollisionTest.html
	MERCury/target/site/apidocs/radirius/merc/tests/ColorTest.html
	MERCury/target/site/apidocs/radirius/merc/tests/FboTest.html
	MERCury/target/site/apidocs/radirius/merc/tests/FullscreenTest.html
	MERCury/target/site/apidocs/radirius/merc/tests/GUITest.html
	MERCury/target/site/apidocs/radirius/merc/tests/ParticleTest.html
	MERCury/target/site/apidocs/radirius/merc/tests/SplashTest.html
	MERCury/target/site/apidocs/radirius/merc/tests/SpriteSheetTest.html
	MERCury/target/site/apidocs/radirius/merc/tests/StressTest.html
	MERCury/target/site/apidocs/radirius/merc/tests/class-use/AudioTest.html
	MERCury/target/site/apidocs/radirius/merc/tests/class-use/CollisionTest.html
	MERCury/target/site/apidocs/radirius/merc/tests/class-use/ColorTest.html
	MERCury/target/site/apidocs/radirius/merc/tests/class-use/FboTest.html
	MERCury/target/site/apidocs/radirius/merc/tests/class-use/FullscreenTest.html
	MERCury/target/site/apidocs/radirius/merc/tests/class-use/GUITest.html
	MERCury/target/site/apidocs/radirius/merc/tests/class-use/ParticleTest.html
	MERCury/target/site/apidocs/radirius/merc/tests/class-use/SplashTest.html
	MERCury/target/site/apidocs/radirius/merc/tests/class-use/SpriteSheetTest.html
	MERCury/target/site/apidocs/radirius/merc/tests/class-use/StressTest.html
	MERCury/target/site/apidocs/radirius/merc/tests/package-frame.html
	MERCury/target/site/apidocs/radirius/merc/tests/package-summary.html
	MERCury/target/site/apidocs/radirius/merc/tests/package-tree.html
	MERCury/target/site/apidocs/radirius/merc/tests/package-use.html
	MERCury/target/site/apidocs/radirius/merc/utils/ArrayUtils.html
	MERCury/target/site/apidocs/radirius/merc/utils/DopplerTileMapReader.html
	MERCury/target/site/apidocs/radirius/merc/utils/EasingUtils.html
	MERCury/target/site/apidocs/radirius/merc/utils/TaskTiming.Task.html
	MERCury/target/site/apidocs/radirius/merc/utils/TaskTiming.html
	MERCury/target/site/apidocs/radirius/merc/utils/Wipeable.html
	MERCury/target/site/apidocs/radirius/merc/utils/WipingArrayList.html
	MERCury/target/site/apidocs/radirius/merc/utils/class-use/ArrayUtils.html
	MERCury/target/site/apidocs/radirius/merc/utils/class-use/DopplerTileMapReader.html
	MERCury/target/site/apidocs/radirius/merc/utils/class-use/EasingUtils.html
	MERCury/target/site/apidocs/radirius/merc/utils/class-use/TaskTiming.Task.html
	MERCury/target/site/apidocs/radirius/merc/utils/class-use/TaskTiming.html
	MERCury/target/site/apidocs/radirius/merc/utils/class-use/Wipeable.html
	MERCury/target/site/apidocs/radirius/merc/utils/class-use/WipingArrayList.html
	MERCury/target/site/apidocs/radirius/merc/utils/package-frame.html
	MERCury/target/site/apidocs/radirius/merc/utils/package-summary.html
	MERCury/target/site/apidocs/radirius/merc/utils/package-tree.html
	MERCury/target/site/apidocs/radirius/merc/utils/package-use.html
	MERCury/target/site/apidocs/serialized-form.html