Updated code base to be compatible with Xcode 6 beta 3.