Updated for CBL beta 3 and Xcode 5.1