@orta => xcode 6

updates to use all things compatible with xcode 6