Merge branch 'master' of https://github.com/weslgames/MERCury.git

Conflicts:
	MERCury/src_base/com/radirius/merc/data/TextFile.java
	MERCury/src_base/com/radirius/merc/gfx/Spritesheet.java
	MERCury/src_base/com/radirius/merc/gfx/VAOGraphics.java
	MERCury/src_base/com/radirius/merc/test/SpritesheetTest.java