Fix merge damage affecting android build
Remove ObjectAL, will become a submodule
Add ObjectAL as a submodule
Ogg and Tremor moved into ObjectAL
ObjectAL submodule updated for Android
Move ObjectAL into subproject in Xcode
Fix iOS build
Renaming ObjectAL repo, deleting first
Renaming ObjectAL repo
Mac project fixes
Merge branch 'develop' of git://github.com/marcsalem/cocos2d-swift into develop

Conflicts:
	.gitmodules
	cocos2d-ios.xcodeproj/project.pbxproj