Merge pull request #1585 from seanpaultaylor/next

Fixed #1581 and added WaterSample to XCode
Merge pull request #1586 from seanpaultaylor/next

Adding AndroidManifest configChanges for screenSize
Added WaterSample to CMake and Android