Merge branch 'master' of https://github.com/Radirius/Mercury

Conflicts:
	Project/pom.xml
	Project/target/Mercury-latest-sources.jar
	Project/target/Mercury-latest.jar
	Project/target/classes/com/radirius/mercury/graphics/Shader.class
	Project/target/classes/com/radirius/mercury/graphics/particles/Particle.class
	Project/target/classes/com/radirius/mercury/graphics/particles/ParticleSystem$ParticleSetup.class
	Project/target/classes/com/radirius/mercury/graphics/particles/ParticleSystem.class
	Project/target/classes/com/radirius/mercury/math/MathUtil.class
	Project/target/classes/com/radirius/mercury/math/geometry/Polygon.class
Merge branch 'master' of https://github.com/Radirius/Mercury

Conflicts:
	Project/target/Mercury-latest-sources.jar
	Project/target/Mercury-latest.jar