Merge branch 'master' of https://github.com/bennettbugs/Survivor_Universe into unstable

Conflicts:
	.metadata/.plugins/org.eclipse.core.resources/.history/1/60c0ed61a21200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/12/60a27b48a61200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/14/70948059bb1200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/1b/e0cd5576a71200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/2e/205f5468531300131f21931dd1e92c1b
	.metadata/.plugins/org.eclipse.core.resources/.history/30/900bfefda71200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/42/40fbc04daa1200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/42/f0dd256cad1200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/47/f0633bb68612001312e88597e0584074
	.metadata/.plugins/org.eclipse.core.resources/.history/5b/4068aad9ae1200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/5c/e054209db11200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/6/90482fc7a71200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/7/b0212f0aad1200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/78/e0d19d228712001312e88597e0584074
	.metadata/.plugins/org.eclipse.core.resources/.history/84/f0bd43c78612001312e88597e0584074
	.metadata/.plugins/org.eclipse.core.resources/.history/8c/505f7ed7941200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/a/803e4c33a71200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/ac/307d9bd5521300131f21931dd1e92c1b
	.metadata/.plugins/org.eclipse.core.resources/.history/c2/702afaa1a41200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/ca/c0e19421551300131f21931dd1e92c1b
	.metadata/.plugins/org.eclipse.core.resources/.history/cc/40f318b5a21200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/d4/7068ce2eb01200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/f0/20cc3bbf521300131f21931dd1e92c1b
	.metadata/.plugins/org.eclipse.core.resources/.history/f0/d01d77bea81200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/f3/a0fc31378512001312e88597e0584074
	.metadata/.plugins/org.eclipse.core.resources/.history/fd/9007f55da51200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/fd/d0869c6ca81200131466e5e488254b05
	SS_Engine/Survivor_Engine/Survivor_Engine/source/utility/XML/pugiconfig.hpp
	SS_Engine/Survivor_Engine/Survivor_Engine/source/utility/XML/pugixml.hpp
	SS_Engine/Survivor_Engine/Survivor_Engine/source/win32/File.cpp
	SS_Engine/Survivor_Engine/Survivor_Engine/source/win32/File.h
	SS_Engine/Survivor_Engine/Survivor_Engine/source/win32/Icons.h
	Survivor_Engine/src/gl/glext.hpp
	Survivor_Engine/src/gl/glxew.hpp
	Survivor_Engine/src/os/win32/Threader.hpp
	Survivor_Engine/src/utility/MD5.hpp
	Survivor_Engine/src/utility/Utility.hpp
Re-added console
Minor .gitignore fixes
Reincarnated fixes
Merge branch 'unstable' of github.com:viveret/Survivor_Universe into unstable
Java module
Merge branch 'unstable' of https://github.com/bennettbugs/Survivor_Universe into unstable

Conflicts:
	.gitignore
	.metadata/.plugins/org.eclipse.core.resources/.history/1/60c0ed61a21200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/12/60a27b48a61200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/14/70948059bb1200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/1b/e0cd5576a71200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/2e/205f5468531300131f21931dd1e92c1b
	.metadata/.plugins/org.eclipse.core.resources/.history/30/900bfefda71200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/42/40fbc04daa1200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/42/f0dd256cad1200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/47/f0633bb68612001312e88597e0584074
	.metadata/.plugins/org.eclipse.core.resources/.history/5b/4068aad9ae1200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/5c/e054209db11200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/6/90482fc7a71200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/7/b0212f0aad1200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/78/e0d19d228712001312e88597e0584074
	.metadata/.plugins/org.eclipse.core.resources/.history/84/f0bd43c78612001312e88597e0584074
	.metadata/.plugins/org.eclipse.core.resources/.history/8c/505f7ed7941200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/a/803e4c33a71200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/ac/307d9bd5521300131f21931dd1e92c1b
	.metadata/.plugins/org.eclipse.core.resources/.history/c2/702afaa1a41200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/ca/c0e19421551300131f21931dd1e92c1b
	.metadata/.plugins/org.eclipse.core.resources/.history/cc/40f318b5a21200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/d4/7068ce2eb01200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/f0/20cc3bbf521300131f21931dd1e92c1b
	.metadata/.plugins/org.eclipse.core.resources/.history/f0/d01d77bea81200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/f3/a0fc31378512001312e88597e0584074
	.metadata/.plugins/org.eclipse.core.resources/.history/fd/9007f55da51200131466e5e488254b05
	.metadata/.plugins/org.eclipse.core.resources/.history/fd/d0869c6ca81200131466e5e488254b05
	Survivor_Engine/include/os/win32/Threader.hpp
	Survivor_Engine/include/utility/MD5.hpp
	Survivor_Engine/include/utility/Utility.hpp
	Survivor_Engine/source/os/win32/Threader.h
	Survivor_Engine/source/utility/MD5.h
	Survivor_Engine/source/utility/Utility.h
	Survivor_Engine/src/gl/glext.hpp
	Survivor_Engine/src/gl/glxew.hpp
	Survivor_Engine/src/os/win32/Threader.hpp
	Survivor_Engine/src/utility/MD5.hpp
	Survivor_Engine/src/utility/Utility.hpp
Working plugin system
Working SEGL Module
Working GUI Module
Physics Module
Physics Module