preparing for compile using xcode6beta5
preparing for compile using xcode6beta5
now compiles with Xcode 6 beta 5.
Using the ?? operator simplifies code a lot.
Merge branch 'feature/xcode6beta5_1' into develop