bump cocos2d
fixing push notification to restart launch activity if killed.
bumping cocos2d-x to get fix for texture reload behavior customizable in app.
Merge branch 'game/dragonfall' into feature/PNfix_restart_app
Merge pull request #87 from asmodehn/feature/PNfix_restart_app

Feature/p nfix restart app
comments for quick test of openUrl(), waiting for proper test UI for it.
fix for released android studio 1.0
upgraded wkcocos for android studio released version 1.0
Merge branch 'game/dragonfall' into feature/Google_Game_Services

Conflicts:
	Android/app/testapp.iml
	Android/lib/wkcocos.iml
committing settings for android studio 1.0