Update for Xcode 6.1

WaterfallDemo does't work on Xcode 6.1, so I fixed it.