box2d in progress
Merge branch 'master' of https://github.com/col726/game-engine-CMZ

Conflicts:
	CMZEngine/bin/main/CMZEngine.class
	CMZEngine/bin/main/gameObject/GameObject.class
	CMZEngine_DemoGame/bin/main/DemoGame.class

Signed-off-by: ColinM <col726@gmail.com>
Merge branch 'master' of https://github.com/col726/game-engine-CMZ

Conflicts:
	AndroidProject/workspace/.metadata/.log
	AndroidProject/workspace/.metadata/.mylyn/.tasks.xml.zip
	AndroidProject/workspace/.metadata/.mylyn/tasks.xml.zip
	AndroidProject/workspace/.metadata/.plugins/oracle.eclipse.tools.common.services/TestGameLoop/command.num
	AndroidProject/workspace/.metadata/.plugins/oracle.eclipse.tools.common.services/TestGameLoop/project.num
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.cdt.core/.log
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/TestGameLoop/.indexes/e4/cd/history.index
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.core.resources/.projects/TestGameLoop/org.eclipse.jdt.core/state.dat
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/properties.index
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.eclipse.core.resources
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.egit.ui.prefs
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.jdt.ui.prefs
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.ide.prefs
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.ui.workbench.prefs
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclipse.wst.sse.core.prefs
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHistory.xml
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.egit.ui/dialog_settings.xml
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.dat
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.jdt.ui/QualifiedTypeNameHistory.xml
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.ui.workbench.texteditor/dialog_settings.xml
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	AndroidProject/workspace/.metadata/.plugins/org.eclipse.ui.workbench/workbench.xml
	AndroidProject/workspace/TestGameLoop/.classpath
	AndroidProject/workspace/TestGameLoop/bin/MainPkg/MainGameLoop.class
	AndroidProject/workspace/TestGameLoop/src/MainPkg/MainGameLoop.java
	CMZEngine/bin/main/CMZEngine.class
	CMZEngine/bin/main/gameObject/GameObject.class
	CMZEngine_DemoGame/bin/main/DemoGame.class
jbox2D working