Rewriting stuff
Engine Change PixelThrive
Merge branch 'master' of https://github.com/sor1n/PixelThrive

Conflicts:
	.metadata/.log
	.metadata/.log-ejde
	.metadata/.plugins/org.eclipse.core.resources/.projects/PixelThrive/.markers
	.metadata/.plugins/org.eclipse.core.resources/.projects/PixelThrive/org.eclipse.jdt.core/state.dat
	.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.team.cvs.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.editors.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.jsdt.ui.prefs
	.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.sse.core.prefs
	.metadata/.plugins/org.eclipse.debug.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	.metadata/.plugins/org.eclipse.jdt.core/1952345997.index
	.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
	.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.properties
	.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml
	.metadata/.plugins/org.eclipse.wst.jsdt.core/externalLibsTimeStamps