adding sample ccbproj with publish settings (not hooked up yet)
Merge branch 'develop' into sample_ccbproj
Merge branch 'develop' into sample_ccbproj
Merge branch 'sample_ccbproj' of github.com:gdagley/cocos2d-frame into sample_ccbproj
move sample ccbproj to shared/res
update config with published dir
add /published to Xcode project
changing where android resources are copied from
Merge branch 'develop' into sample_ccbproj

Conflicts:
	shared/res/config.plist
get sample CCB project working on iOS
Uses new cocos2d-x

and adds default values for some config values
wip: creating sample main and game scene
get sample ccb project working on iOS and Android
Merge branch 'develop' into sample_ccbproj

Conflicts:
	shared/Classes/AppDelegate.cpp
Merge pull request #22 from gdagley/sample_ccbproj

Sample ccbproj
updates cocos2d-x to newer version
Fixing bug where for large projects, execution would get stuck in NSLog
Adding JS files missing from project to resources
Adding support for connecting by socket in CocosPlayer for iOS
Adding isPortrait and explicit tablet/phone resolution settings to config.plist