touchsnow
touchsnow
touchsnow
Merge branch 'master' of https://github.com/makeapp/cocoseditor-java-tests

Conflicts:
	cocos-java-tests/.idea/vcs.xml
	cocos-java-tests/.idea/workspace.xml
	cocos-java-tests/cocos-java-tests.iml
	cocos-java-tests/src/main/java/org/ccj/CocosNodeTest.java
	cocos-java-tests/src/main/java/org/ccj/ParallaxTestScene.java
	cocos-java-tests/src/main/java/org/ccj/ParticleTestScene.java
	cocos-java-tests/src/main/java/org/ccj/Sprite3DTestScene.java
	cocos-java-tests/src/main/java/org/ccj/TestLayer.java
	cocos-java-tests/src/main/java/org/ccj/TestMain.java
	cocos-java-tests/src/main/java/org/ccj/TestScene.java
	cocos-java-tests/src/main/java/org/ccj/cocostudio/CocoStudioMainScene.java