Combined projects

Contains the following merges:
https://github.com/cocos2d/cocos2d-swift/pull/1019
https://github.com/cocos2d/cocos2d-swift/pull/1020

This cannot be merged until @collinjackson's ObjectAL pull request is merged here:
https://github.com/spritebuilder/ObjectAL-for-Cocos2D/pull/2

Also combines the Mac/iOS ui-tests projects into a single project so we have many fewer duplicate projects floating around instead of one more. Still working on adding an Android ui-test target. This should make testing on all of the platforms a lot less painful in the future hopefully!