Merge pull request #30 from houguohua/mergecocos3.0

new version 2014-4-11
Merge pull request #33 from houguohua/mergecocos3.0

delete .svn file + modify device restore bug on android
Merge pull request #34 from houguohua/mergecocos3.0

update to cocos2d-x rc1
Merge pull request #35 from houguohua/mergecocos3.0

reconfigure template project
Merge pull request #36 from houguohua/mergecocos3.0

version 2014-4-18
EngineDemo_Prefix.pch conflict
Merge pull request #30 from super626/mergecocos3.0

unsolved conflict