Merge pull request #1587 from seanpaultaylor/next

Added WaterSample to CMake and Android
Removed user specific QtCreator files