win logo
Merge branch 'master' of https://git.oschina.net/kafeier/Magnetic
over_layer
Merge branch 'master' of https://git.oschina.net/kafeier/Magnetic

Conflicts:
	Magnetic/project.json
	Magnetic/src/GameLayer.js
	Magnetic/src/ScoreController.js
Merge branch 'master' of https://git.oschina.net/kafeier/Magnetic
over_layer
Data modify
Merge branch 'master' of https://git.oschina.net/kafeier/Magnetic
Signed-off-by: kafeier <791961143@qq.com>
Merge branch 'master' of https://git.oschina.net/kafeier/Magnetic.git
Remove app.js
Merge branch 'master' of https://git.oschina.net/kafeier/Magnetic
over_layer
Merge branch 'master' of https://git.oschina.net/kafeier/Magnetic
debug
Data modify
Data modify
Add PLAYER_JUMP_TOP and TestWall
TestWall -> Platform
Merge branch 'master' of https://git.oschina.net/kafeier/Magnetic

Conflicts:
	Magnetic/src/GlobalValue.js