Fixed #1581 and added WaterSample to XCode

This also makes sure people can build out of the box on older version of xcode my lowering the default deployment targets for MacOSX to 10.7 and iOS to 7.1