Merge pull request #30 from houguohua/mergecocos3.0

new version 2014-4-11
Merge pull request #29 from lvlonggame/mergecocos3.0

remove svn
android reload bug modify
Merge branch 'mergecocos3.0' of github.com:houguohua/cocos3d-x into mergecocos3.0
Merge pull request #33 from houguohua/mergecocos3.0

delete .svn file + modify device restore bug on android
bug fix: memory leak
update to rc1 of cocos2d-x
update to rc1
Merge pull request #34 from houguohua/mergecocos3.0

update to cocos2d-x rc1
configure project for ios
Merge branch 'mergecocos3.0' of github.com:houguohua/cocos3d-x into mergecocos3.0

Conflicts:
	EngineDemo/proj.ios/EngineDemo.xcodeproj/project.pbxproj
reconfigure template project
Merge pull request #35 from houguohua/mergecocos3.0

reconfigure template project
bug fix
modify material for projected texture
add ambient color for material test scene
ios project compile faild
add prefix file
add prefix file
Merge pull request #36 from houguohua/mergecocos3.0

version 2014-4-18