Fixed header include paths for cocos2d - must used $SRC_ROOT, otherwise android project will not build correctly.
Merge branch 'develop-v3' of https://github.com/apportable/cocos2d-iphone into develop-v3
Merge branch 'develop-v3' of https://github.com/apportable/cocos2d-iphone into develop-v3

Conflicts:
	cocos2d-ios.xcodeproj/project.pbxproj