Feature/xcode6 notes