New Water bar.
Merge branch 'master' of https://github.com/Lusito/GameDevWeek.git

Conflicts:
	gdx-kitten-rescue/src/main/resources/data/images/water.png
	gdx-kitten-rescue/src/main/resources/data/json/images.json
Merge branch 'master' of https://github.com/Lusito/GameDevWeek.git
Merge branch 'master' of https://github.com/Lusito/GameDevWeek.git