Merge remote-tracking branch 'origin/master' into 021214renderer

Conflicts:
	src/net/mosstest/scripting/MapChunk.java
	src/net/mosstest/servercore/RenderMapChunk.java
	src/net/mosstest/servercore/RenderNode.java
	src/net/mosstest/servercore/RenderProcessor.java

Merge this into master immediately! (4:30pm 2/16/2014)
Merge remote-tracking branch 'origin/master' into 021214renderer
Merge branch 'master' of https://github.com/mosstest/mosstest into
021214renderer

Conflicts:
	tests/net/mosstest/tests/NodePositionTest.java
Merge remote-tracking branch 'origin/master' into 021214renderer

Conflicts:
	pom.xml
	src/net/mosstest/launcher/GUIClientsideLauncher.java
	src/net/mosstest/scripting/MapChunk.java
	src/net/mosstest/scripting/NodePosition.java
	src/net/mosstest/scripting/SimplexMapGenerator.java
	src/net/mosstest/servercore/IFileManager.java
	src/net/mosstest/servercore/IMossFile.java
	src/net/mosstest/servercore/LocalAssetLocator.java
	src/net/mosstest/servercore/LocalFile.java
	src/net/mosstest/servercore/LocalFileManager.java
	src/net/mosstest/servercore/MossWorld.java
	src/net/mosstest/servercore/MosstestSecurityManager.java
	src/net/mosstest/servercore/RenderProcessor.java
	tests/net/mosstest/tests/NodePositionTest.java
Merge remote-tracking branch 'origin/master' into 021214renderer
Isolating z-fighting issues to fix
Merge remote-tracking branch 'origin' into 021214renderer

Conflicts:
	.travis.yml
	data
	src/net/mosstest/scripting/MapChunk.java
	src/net/mosstest/scripting/MossScriptEnv.java
	src/net/mosstest/scripting/Position.java
	tests/net/mosstest/tests/MapChunkTest.java
Debugging preparation (before javascript naming mismatch error is
corrected)
Merge remote-tracking branch 'origin' into 021214renderer

Conflicts:
	data
	pom.xml
	src/net/mosstest/servercore/AbstractNodeManager.java
Merge remote-tracking branch 'origin/master' into 021214renderer

Conflicts:
	src/net/mosstest/scripting/MapChunk.java
	src/net/mosstest/servercore/MapCache.java
	src/net/mosstest/servercore/MapDatabase.java
Fixed Z-Fighting issue
Very Buggy Texture Support
try some fixes for texture coordinates (although a full fix will require changes better made by thatnerd2
Merge branch 'master' into 021214renderer, last master rev being a working script importer

Conflicts:
	src/net/mosstest/scripting/MossScriptEnv.java
Texture coordinate system underway, committing in preparation for script
error fixes
Merge remote-tracking branch 'origin' into 021214renderer

Conflicts:
	src/net/mosstest/scripting/MossScriptEnv.java
Merge branch '021214renderer' of https://github.com/mosstest/mosstest into 021214renderer
Converge with master branch and remote 021214 renderer
Really strange error where two faces are missing.
Semi-fixed texture problem